Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin