Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <tmbinc@2mac.waldobjekt.org>
Fri, 26 Jun 2009 11:47:21 +0000 (13:47 +0200)
committerFelix Domke <tmbinc@2mac.waldobjekt.org>
Fri, 26 Jun 2009 11:47:21 +0000 (13:47 +0200)

Trivial merge