Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Tue, 6 Oct 2009 07:37:50 +0000 (09:37 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Tue, 6 Oct 2009 07:37:50 +0000 (09:37 +0200)

Trivial merge