Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 13 Mar 2012 16:07:50 +0000 (16:07 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 13 Mar 2012 16:07:50 +0000 (16:07 +0000)

Trivial merge