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