Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Mon, 29 Jul 2013 15:56:02 +0000 (16:56 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 29 Jul 2013 15:56:02 +0000 (16:56 +0100)

Trivial merge