Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 6 Feb 2009 15:40:17 +0000 (16:40 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 6 Feb 2009 15:40:17 +0000 (16:40 +0100)
commitfc83470c30c0a314277fbda3e5c43a2ada4ac2d9
tree86eaa0702a584ecf7da39a5eee391fcb35af685b
parentb6b788b0f8da7e1adcde03cebb464da484f48508
parentb72b63becb838cae62ecacf9026acfeec61e0e36
Merge branch 'master' of git.opendreambox.org:/git/enigma2