Merge commit 'origin/bug_383_softwaremanager' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 07:35:27 +0000 (08:35 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 07:35:27 +0000 (08:35 +0100)
commitef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4
treea3823cf006a0e07474a254fa6ad140a705974f4d
parent547ecaf9bfda061aca736aefb04ca0743a6395cc
parentbb2987585250d140bc125d8e316f2381421447e4
Merge commit 'origin/bug_383_softwaremanager' into experimental

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