Merge branch 'trivial-patches' of git://repo.or.cz/qemu/stefanha