tree a3f74af6eb70e978bd43613bad35592b833ec6e5
parent 8f46820d920b9cd149559b5d32e6b306ee2e24ba
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> 1099850642 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> 1099850642 +0000

audio merge (malc)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1125 c046a42c-6fe2-441c-8c8c-71466251a162