Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 7 Nov 2008 08:00:32 +0000 (09:00 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 7 Nov 2008 08:00:32 +0000 (09:00 +0100)

Trivial merge