Merge branch '2_5_to_2_6_bug_107'
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)
1  2 
lib/service/servicemp3.cpp

Simple merge