Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 17 Apr 2012 17:19:12 +0000 (18:19 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 17 Apr 2012 17:19:12 +0000 (18:19 +0100)

Trivial merge