Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 20 Jan 2009 10:53:31 +0000 (11:53 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 20 Jan 2009 10:53:31 +0000 (11:53 +0100)

Trivial merge