Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 25 Jun 2010 15:05:20 +0000 (16:05 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 25 Jun 2010 15:05:20 +0000 (16:05 +0100)

Trivial merge