Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 7 Nov 2008 13:38:13 +0000 (14:38 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 7 Nov 2008 13:38:13 +0000 (14:38 +0100)

Trivial merge