From: malc <av1474@comtv.ru>
Date: Tue, 1 Nov 2011 22:16:34 +0000 (+0400)
Subject: Merge branch 'master' of git://git.qemu.org/qemu
X-Git-Tag: v1.0-rc0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef26ee0e6c67d415f8b22850f9f13a972ada8be1;p=thirdparty%2Fqemu.git

Merge branch 'master' of git://git.qemu.org/qemu
---

ef26ee0e6c67d415f8b22850f9f13a972ada8be1