Merge
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 6 Jul 2010 16:58:37 +0000 (17:58 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 6 Jul 2010 16:58:37 +0000 (17:58 +0100)

Trivial merge