Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 14:32:45 +0000 (14:32 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 14:32:45 +0000 (14:32 +0000)

Trivial merge