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

Trivial merge