Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 29 Jul 2009 08:26:15 +0000 (10:26 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 29 Jul 2009 08:26:15 +0000 (10:26 +0200)

Trivial merge