Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 13 Nov 2008 13:30:21 +0000 (14:30 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 13 Nov 2008 13:30:21 +0000 (14:30 +0100)

Trivial merge