From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 6 Nov 2009 17:17:22 +0000 (+0100)
Subject: Merge branch 'master' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~209
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/bbb82688540582d2049b584e5263cbc0423fb551

Merge branch 'master' into experimental

Conflicts:
	lib/python/Components/config.py
---

bbb82688540582d2049b584e5263cbc0423fb551