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

Trivial merge