Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 28 Jun 2010 16:40:16 +0000 (17:40 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 28 Jun 2010 16:40:16 +0000 (17:40 +0100)

Trivial merge