Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 3 Mar 2011 18:52:09 +0000 (18:52 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 3 Mar 2011 18:52:09 +0000 (18:52 +0000)

Trivial merge