Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 14 Nov 2008 15:32:13 +0000 (16:32 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 14 Nov 2008 15:32:13 +0000 (16:32 +0100)

Trivial merge