Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Sep 2009 09:29:16 +0000 (11:29 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Sep 2009 09:29:16 +0000 (11:29 +0200)

Trivial merge