Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 20 May 2009 14:33:30 +0000 (16:33 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 20 May 2009 14:33:30 +0000 (16:33 +0200)

Trivial merge