Merge
authorKeir Fraser <keir.fraser@citrix.com>
Sat, 15 May 2010 07:40:03 +0000 (08:40 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Sat, 15 May 2010 07:40:03 +0000 (08:40 +0100)

Trivial merge