Merge branch '2_5_to_2_6_bug_107' 2.6.0
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 2 Nov 2009 15:00:05 +0000 (16:00 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 2 Nov 2009 15:00:05 +0000 (16:00 +0100)
commitf3a30a79a5dda5f33a9241de575bbf9fa66b4170
tree27ab064722ed11419a44f0518578140f8bd1e33d
parente5d1c5ed0eab9fd038ecde67a16a79dd1ba50f41
parent597d64c2e00be8759286e37fd15823b1c1518845
Merge branch '2_5_to_2_6_bug_107'
lib/service/servicemp3.cpp