Merge branch 'bug_537_vobsub' of git.opendreambox.org:/git/enigma2 into bug_537_vobsub
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 26 Jul 2010 10:37:04 +0000 (12:37 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 26 Jul 2010 10:37:04 +0000 (12:37 +0200)
commit05d902ffb1a0dfb03cbb69324ceb20439b73c977
treee5b36cf4f891bf21d15cf22b94b115bf5bb2edd2
parentda583812c4b20dcf72b69415d65dc1398fd849ce
parentc443b776e07c18301f9c7d05b80741e6a6aea681
Merge branch 'bug_537_vobsub' of git.opendreambox.org:/git/enigma2 into bug_537_vobsub

Conflicts:
lib/python/Components/ConfigList.py
lib/python/Screens/AudioSelection.py
lib/service/servicemp3.cpp
lib/service/servicemp3.h
lib/service/servicemp3.cpp