Merge branch 'bug_308_add_where_softwaremanager'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:57:25 +0000 (06:57 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:57:25 +0000 (06:57 +0100)
commit4e6cd91094c4491134f5d8f81b03282fb50f7f09
tree015a67f42dcf0e52792bb580959709b05016838c
parentca13d7906607bb7be40e7695e36054b8b86c8529
parent3e4556706ac4c42b68594be8477fb204cd5ff0e9
Merge branch 'bug_308_add_where_softwaremanager'

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