Merge branch 'axp-system-7' of git://repo.or.cz/qemu/rth