From: Justin M. Forbes <jforbes@redhat.com>
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: v1.0.1~4
X-Git-Url: https://repo.or.cz/w/qemu.git/commitdiff_plain/85a4ca797dbe25f27df0a66aa4df1cab63245cd3

Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0
---

85a4ca797dbe25f27df0a66aa4df1cab63245cd3