Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 4 Mar 2009 23:12:49 +0000 (00:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 4 Mar 2009 23:12:49 +0000 (00:12 +0100)

Trivial merge