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

Trivial merge