Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 13 Aug 2010 12:55:51 +0000 (13:55 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 13 Aug 2010 12:55:51 +0000 (13:55 +0100)

Trivial merge