Merge branch 'bug_249_current_skin_fallback' into experimental

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

diff --cc lib/python/Components/FileList.py
index b187ee3ef1d732c22d8e20e776247707e7cbbd68,0d77553ad0f5969a282e69862101af550352b35b..222512eab861180ef3d26810040442ac4af63b7c
--- 1/lib/python/Components/FileList.py
--- 2/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@@ -3,7 -3,7 +3,7 @@@ from os import path as os_path, listdi
  from MenuList import MenuList
  from Components.Harddisk import harddiskmanager
  
- from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename, fileExists
 -from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
++from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename, fileExists
  
  from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
        eServiceReference, eServiceCenter, gFont

diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index c1badb245b287f0196459d4ea6cb0e5f88145301,a2422be7052433703592896cecec3e9df43d5e35..0fc78fb10923ec7b0150054505df812403538f3c
mode 100644,100755..100755
--- 1/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py