Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 11 Nov 2008 18:13:10 +0000 (19:13 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 11 Nov 2008 18:13:10 +0000 (19:13 +0100)

Trivial merge