Merge branch 'for-upstream' of git://github.com/mwalle/qemu