Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0