Merge branch 'master' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 4 Nov 2009 15:41:12 +0000 (16:41 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 4 Nov 2009 15:41:12 +0000 (16:41 +0100)
commit5ded85314f4d8b221b885a443dc797632a2101cd
tree81b9ee9b012236783b842b6fc4390f15154bf508
parente6a3b9fdb8f5ac0774a27794b175d79cf0973976
parentaaeba87c8ee1b528dc9660dab9c6980155e878d4
Merge branch 'master' into experimental

Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Components/FileList.py
lib/python/Components/config.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/service/servicemp3.cpp