Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 20 Feb 2009 13:18:43 +0000 (14:18 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 20 Feb 2009 13:18:43 +0000 (14:18 +0100)

Trivial merge