Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 23 Mar 2009 12:34:12 +0000 (13:34 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 23 Mar 2009 12:34:12 +0000 (13:34 +0100)

Trivial merge