Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 10 Nov 2008 09:18:28 +0000 (10:18 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 10 Nov 2008 09:18:28 +0000 (10:18 +0100)

Trivial merge