Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Thu, 8 Aug 2013 12:16:01 +0000 (13:16 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 8 Aug 2013 12:16:01 +0000 (13:16 +0100)

Trivial merge