Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 9 Jul 2010 11:35:58 +0000 (12:35 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 9 Jul 2010 11:35:58 +0000 (12:35 +0100)

Trivial merge