Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 11 Mar 2011 18:21:17 +0000 (18:21 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 11 Mar 2011 18:21:17 +0000 (18:21 +0000)

Trivial merge