Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sat, 7 Nov 2009 12:53:02 +0000 (13:53 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sat, 7 Nov 2009 12:53:02 +0000 (13:53 +0100)

Trivial merge