Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Feb 2009 01:23:57 +0000 (02:23 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Feb 2009 01:23:57 +0000 (02:23 +0100)

Trivial merge