Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Feb 2009 14:21:36 +0000 (15:21 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Feb 2009 14:21:36 +0000 (15:21 +0100)

Trivial merge