Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sun, 15 Nov 2009 10:52:44 +0000 (11:52 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sun, 15 Nov 2009 10:52:44 +0000 (11:52 +0100)
commit2d41896b26c577a592a70b3e36acc368977ee0c5
tree205f829c07d0f6c787250022c099e86589ea1c2f
parent421f248d4521400d724670ed991d0a44ac6f10ad
parent5607b07c7bc261605a984d103ae5d7132bdd5cf0
Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6