Merge branch 'bug_236_recordpath'

diff --cc data/menu.xml
Simple merge

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

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

diff --cc lib/python/Screens/InfoBarGenerics.py
Simple merge

diff --cc lib/python/Screens/TimerEntry.py
index c6b0db8f815cc556d01a62044bb1cb5fa0d799e4,5813bac53e522490446465abdd5c088c0a0e8524..b231b568d7ceee54119f42c8a09293546c0caa1f
--- 1/lib/python/Screens/TimerEntry.py
--- 2/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@@ -8,7 -8,7 +8,8 @@@ from Components.MenuList import MenuLis
  from Components.Button import Button
  from Components.Label import Label
  from Components.Pixmap import Pixmap
 +from Components.SystemInfo import SystemInfo
+ from Components.UsageConfig import defaultMoviePath
  from Screens.MovieSelection import getPreferredTagEditor
  from Screens.LocationBox import MovieLocationBox
  from Screens.ChoiceBox import ChoiceBox