Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 2 Jul 2010 16:34:44 +0000 (17:34 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 2 Jul 2010 16:34:44 +0000 (17:34 +0100)

Trivial merge