Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 6 Apr 2009 10:20:39 +0000 (12:20 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 6 Apr 2009 10:20:39 +0000 (12:20 +0200)

Trivial merge