Merge branch 'master' into bug_374_missingcodecwarning master-2011.03
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +0100)
1  2 
lib/service/servicemp3.cpp

Simple merge