Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 13 Nov 2008 12:01:54 +0000 (13:01 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 13 Nov 2008 12:01:54 +0000 (13:01 +0100)

Trivial merge