From: malc <av1474@comtv.ru>
Date: Sun, 11 Dec 2011 20:47:40 +0000 (+0400)
Subject: Merge branch 'master' of git://git.qemu.org/qemu
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5bf1356026f920de1158f32bb8472ed120a1131f;p=qemu.git

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

5bf1356026f920de1158f32bb8472ed120a1131f