Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 20 Feb 2009 10:39:29 +0000 (11:39 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 20 Feb 2009 10:39:29 +0000 (11:39 +0100)

Trivial merge