Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 27 May 2009 09:36:01 +0000 (11:36 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 27 May 2009 09:36:01 +0000 (11:36 +0200)

Trivial merge