Merge branch 'bug_249_current_skin_fallback'

Conflicts:
	lib/python/Components/FileList.py

diff --cc lib/python/Components/FileList.py
index b187ee3,0d77553..222512e
--- 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