Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 21 Aug 2009 07:03:00 +0000 (09:03 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 21 Aug 2009 07:03:00 +0000 (09:03 +0200)

Trivial merge