Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 29 May 2009 15:02:39 +0000 (17:02 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 29 May 2009 15:02:39 +0000 (17:02 +0200)

Trivial merge