Merge branch 'master' into experimental

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

diff --cc lib/python/Components/FileList.py
Simple merge

diff --cc lib/python/Components/config.py
Simple merge

diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 596f2d5abd8e9dd7e45d30ff0e5bb583ad086043,98bc060c2053da6cbe7e16bf0e96f59cc58db768..c1badb245b287f0196459d4ea6cb0e5f88145301
--- 1/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@@ -110,7 -110,7 +110,7 @@@ class MediaPlayer(Screen, InfoBarBase, 
  
                # 'None' is magic to start at the list of mountpoints
                defaultDir = config.mediaplayer.defaultDir.getValue()
-               self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
 -              self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
++              self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
                self["filelist"] = self.filelist
  
                self.playlist = MyPlayList()

diff --cc lib/service/servicemp3.cpp
Simple merge