Merge commit 'qemu-svn/trunk'