Merge branch 'juha-devel' of ssh://voipio@juri/home/voipio/qemu into riku-devel
authorRiku Voipio <riku.voipio@nokia.com>
Thu, 5 Mar 2009 10:12:57 +0000 (12:12 +0200)
committerRiku Voipio <riku.voipio@nokia.com>
Thu, 5 Mar 2009 10:12:57 +0000 (12:12 +0200)

Trivial merge