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

Trivial merge