From: Justin M. Forbes Date: Tue, 10 Jan 2012 20:41:17 +0000 (-0600) Subject: Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0 X-Git-Tag: qemu-xen-4.2.0~42 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=85a4ca797dbe25f27df0a66aa4df1cab63245cd3;p=qemu-upstream-4.2-testing.git Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0 --- 85a4ca797dbe25f27df0a66aa4df1cab63245cd3