merge changes between experimental and master
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 20:37:10 +0000 (22:37 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 20:37:10 +0000 (22:37 +0200)
commitcdb4e68027ec99a49805d8ab5e84d644f5ec2ff1
treebaecb95ded4ba66e8b4599700d166bdfa004cb4f
parente4dc3ba0e1ca66ed5fa7aab8d55e8518d1610aa2
merge changes between experimental and master
lib/service/servicemp3.cpp