Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 May 2009 11:10:34 +0000 (13:10 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 May 2009 11:10:34 +0000 (13:10 +0200)

Trivial merge