Merge branch 'bug_249_current_skin_fallback' into experimental
authoracid-burn <acidburn@opendreambox.org>
Wed, 11 Nov 2009 09:56:30 +0000 (10:56 +0100)
committeracid-burn <acidburn@opendreambox.org>
Wed, 11 Nov 2009 09:56:30 +0000 (10:56 +0100)
commit39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e
tree26eb3798f34956754bef6c9f4a2c1a285601876a
parent383faf2da1a60442431dce44760a0392c5829dc8
parentd64e82b37efdf77b557234809d0c81857818bfac
Merge branch 'bug_249_current_skin_fallback' into experimental

Conflicts:
lib/python/Components/FileList.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Components/FileList.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py