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)
commit421f248d4521400d724670ed991d0a44ac6f10ad
treec1c5ab354b3efcf5ba4ccfac8e3dc0c7d6575d99
parentfe79a39da47fd1ef36ade6ac8ad1b6f794c39d48
parentae74d5cc79dc30b8b496b2645b836e0dd9c98267
Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6