Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 26 May 2011 14:08:44 +0000 (15:08 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 26 May 2011 14:08:44 +0000 (15:08 +0100)

Trivial merge