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

Trivial merge