Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 30 Aug 2011 10:46:58 +0000 (11:46 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 30 Aug 2011 10:46:58 +0000 (11:46 +0100)

Trivial merge