Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 6 Oct 2009 22:50:36 +0000 (00:50 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 6 Oct 2009 22:50:36 +0000 (00:50 +0200)

Trivial merge