Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 17 Jul 2009 10:37:07 +0000 (12:37 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 17 Jul 2009 10:37:07 +0000 (12:37 +0200)

Trivial merge