Merge branch 'master' into bug_236_recordpath
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 5 Nov 2009 07:30:02 +0000 (08:30 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 5 Nov 2009 07:30:02 +0000 (08:30 +0100)
commita8fd8e5e6c8a56c2e8dcdfbf7927b7e31221fd9a
tree74b93ccdc96f04b4d272d69f084fe3080731f152
parent7560beb3e371704d798259ca1ea927bf4575306c
parent946a71097573dc8abc273d24efd23bab3e5f2fb2
Merge branch 'master' into bug_236_recordpath
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py