Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Mon, 4 Nov 2013 17:50:20 +0000 (17:50 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 4 Nov 2013 17:50:20 +0000 (17:50 +0000)

Trivial merge