Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Feb 2009 23:36:24 +0000 (00:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Feb 2009 23:36:24 +0000 (00:36 +0100)

Trivial merge