Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 15 Jan 2009 12:22:06 +0000 (13:22 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 15 Jan 2009 12:22:06 +0000 (13:22 +0100)

Trivial merge