Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorAndreas Oberritter <obi@saftware.de>
Fri, 10 Jul 2009 11:22:05 +0000 (13:22 +0200)
committerAndreas Oberritter <obi@saftware.de>
Fri, 10 Jul 2009 11:22:05 +0000 (13:22 +0200)

Trivial merge