Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 3 Mar 2009 10:52:30 +0000 (11:52 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 3 Mar 2009 10:52:30 +0000 (11:52 +0100)

Trivial merge