Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 17 Nov 2008 13:05:17 +0000 (14:05 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 17 Nov 2008 13:05:17 +0000 (14:05 +0100)

Trivial merge