Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 17 Nov 2008 22:34:25 +0000 (23:34 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 17 Nov 2008 22:34:25 +0000 (23:34 +0100)

Trivial merge