Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Sun, 14 Dec 2008 00:22:59 +0000 (01:22 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Sun, 14 Dec 2008 00:22:59 +0000 (01:22 +0100)

Trivial merge