Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 28 Jul 2010 15:32:33 +0000 (16:32 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 28 Jul 2010 15:32:33 +0000 (16:32 +0100)

Trivial merge