From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 16 Nov 2009 10:04:28 +0000 (+0100)
Subject: Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=f4d23a9c5572d9800379d49be1a5d193fc9db316

Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
---

f4d23a9c5572d9800379d49be1a5d193fc9db316