merge fix
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 20 Jul 2010 08:11:35 +0000 (10:11 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 20 Jul 2010 08:11:35 +0000 (10:11 +0200)
commitc133a7b7ee3642dac16867449fc94b86b5d8fed5
tree49ea80b90db35254ef4411ad3b93718cf03ef6e5
parent675f9d0eeb82577252a68ee263049acc1ff80bcc
merge fix
lib/service/servicemp3.cpp