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

Trivial merge