Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 16 Jul 2010 16:44:04 +0000 (17:44 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 16 Jul 2010 16:44:04 +0000 (17:44 +0100)

Trivial merge