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

Trivial merge