Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Thu, 12 Nov 2009 17:45:41 +0000 (18:45 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Thu, 12 Nov 2009 17:45:41 +0000 (18:45 +0100)

Trivial merge