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)

Trivial merge