Merge branch 'master' into bug_245_record_playback_fixes
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Dec 2009 16:56:03 +0000 (17:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Dec 2009 16:56:03 +0000 (17:56 +0100)
commit0cb206d2c07cb9e4130e13234e3fd59b127421a8
tree07bcbcc638a6012d32b0574531cf0bd8304484ae
parent99a717e9813eab30cd34f5da6f4a5ab6e791dc1f
parente9272c492c7a3c7fd8a1225a4baa6bee2a02eea8
Merge branch 'master' into bug_245_record_playback_fixes
lib/python/Screens/InfoBarGenerics.py