Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Thu, 3 Sep 2009 12:33:51 +0000 (14:33 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Thu, 3 Sep 2009 12:33:51 +0000 (14:33 +0200)

Trivial merge