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

Trivial merge