Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 21 Feb 2009 12:45:12 +0000 (13:45 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 21 Feb 2009 12:45:12 +0000 (13:45 +0100)

Trivial merge