Merge branch 'stable-0.11' of git://git.sv.gnu.org/qemu into stable-0.11