From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 19 Jan 2010 07:35:27 +0000 (+0100)
Subject: Merge commit 'origin/bug_383_softwaremanager' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4

Merge commit 'origin/bug_383_softwaremanager' into experimental

Conflicts:
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
---

ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4