Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 2 Jan 2009 16:16:37 +0000 (17:16 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 2 Jan 2009 16:16:37 +0000 (17:16 +0100)

Trivial merge