Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Dec 2008 20:37:14 +0000 (21:37 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Dec 2008 20:37:14 +0000 (21:37 +0100)

Trivial merge