Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 30 Jan 2009 14:29:32 +0000 (15:29 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 30 Jan 2009 14:29:32 +0000 (15:29 +0100)

Trivial merge