Merge branch 'master' of /home/nchip/public_html/qemu into garage-push master
authorRiku Voipio <riku.voipio@iki.fi>
Wed, 8 Jul 2009 12:47:19 +0000 (15:47 +0300)
committerRiku Voipio <riku.voipio@iki.fi>
Wed, 8 Jul 2009 12:47:19 +0000 (15:47 +0300)

Trivial merge