merge
authorStefano Stabellini <sstabellini@xensource.com>
Thu, 12 Aug 2010 17:56:20 +0000 (18:56 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Thu, 12 Aug 2010 17:56:20 +0000 (18:56 +0100)

Trivial merge