Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 2 Jan 2009 17:02:42 +0000 (18:02 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 2 Jan 2009 17:02:42 +0000 (18:02 +0100)

Trivial merge