Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <tmbinc@2mac.waldobjekt.org>
Sun, 14 Jun 2009 22:52:22 +0000 (00:52 +0200)
committerFelix Domke <tmbinc@2mac.waldobjekt.org>
Sun, 14 Jun 2009 22:52:22 +0000 (00:52 +0200)

Trivial merge