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

Trivial merge