Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 15 Dec 2010 16:49:25 +0000 (16:49 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 15 Dec 2010 16:49:25 +0000 (16:49 +0000)

Trivial merge