Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 24 Nov 2008 18:10:39 +0000 (19:10 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 24 Nov 2008 18:10:39 +0000 (19:10 +0100)

Trivial merge