From: malc <av1474@comtv.ru>
Date: Mon, 12 Dec 2011 00:12:31 +0000 (+0400)
Subject: Merge branch 'master' of git://git.qemu.org/qemu
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f18318eef8b4b263f4e82a5338c9b2875a6c73c8;p=qemu.git

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

f18318eef8b4b263f4e82a5338c9b2875a6c73c8