Merge branch 'master' of blueswir1@git.sv.gnu.org:/srv/git/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 25 Apr 2009 15:26:25 +0000 (15:26 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 25 Apr 2009 15:26:25 +0000 (15:26 +0000)

Trivial merge