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

Trivial merge