]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:14:19 +0000 (02:14 +0400)
committermalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:14:19 +0000 (02:14 +0400)

Trivial merge