Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 20 Nov 2008 00:17:48 +0000 (01:17 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 20 Nov 2008 00:17:48 +0000 (01:17 +0100)

Trivial merge