Merge branch 'debian-packaging' of ssh://voipio@juri/home/voipio/qemu into debian...
authorRiku Voipio <riku.voipio@nokia.com>
Tue, 10 Feb 2009 14:11:11 +0000 (16:11 +0200)
committerRiku Voipio <riku.voipio@nokia.com>
Tue, 10 Feb 2009 14:11:11 +0000 (16:11 +0200)
Conflicts:

linux-user/main.c

make drop-ld-preload default (this is for sb1, sigh)


Trivial merge