Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 9 Feb 2009 13:50:20 +0000 (14:50 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 9 Feb 2009 13:50:20 +0000 (14:50 +0100)

Trivial merge