Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 11 Dec 2008 15:38:00 +0000 (16:38 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 11 Dec 2008 15:38:00 +0000 (16:38 +0100)

Trivial merge