Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Tue, 5 Jan 2010 13:42:23 +0000 (14:42 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Tue, 5 Jan 2010 13:42:23 +0000 (14:42 +0100)

Trivial merge