Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 3 Dec 2008 16:53:56 +0000 (17:53 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 3 Dec 2008 16:53:56 +0000 (17:53 +0100)

Trivial merge