Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Dec 2008 17:03:16 +0000 (18:03 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Dec 2008 17:03:16 +0000 (18:03 +0100)

Trivial merge