Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Mon, 7 Dec 2009 13:22:39 +0000 (14:22 +0100)
committerMladen Horvat <acid-burn@opendreambox.org>
Mon, 7 Dec 2009 13:22:39 +0000 (14:22 +0100)
commit28d283c49a8791cc84d70877275f232d5cb526ce
tree0dec5ea23297ff8054a850e7c181bc8adaa1789d
parent9fba96095af3d4a6b1b596893f4e005dc0b6f16d
parent3e4556706ac4c42b68594be8477fb204cd5ff0e9
Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental

Conflicts:
lib/python/Plugins/Plugin.py
lib/python/Plugins/Plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py