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

Trivial merge