Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 13 Aug 2010 07:40:21 +0000 (08:40 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 13 Aug 2010 07:40:21 +0000 (08:40 +0100)

Trivial merge