Merge commit 'qemu-svn/stable_0_10' into maint/2.6.30