Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:04:28 +0000 (11:04 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:04:28 +0000 (11:04 +0100)
commitf4d23a9c5572d9800379d49be1a5d193fc9db316
treee6c2f703992c38361a6d6e9b6a52275c70c77988
parentb8b2881217814538fa101deb8af413d3326a4386
parent20c942082eedd5307bd331e4097b9892adaed120
Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6