Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 18 Aug 2010 16:11:13 +0000 (17:11 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 18 Aug 2010 16:11:13 +0000 (17:11 +0100)

Trivial merge