Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 9 Dec 2008 18:58:57 +0000 (19:58 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 9 Dec 2008 18:58:57 +0000 (19:58 +0100)

Trivial merge