Merge commit 'origin/bug_383_softwaremanager' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 13:12:44 +0000 (14:12 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 13:12:44 +0000 (14:12 +0100)
commit5bf1f93262c454ab6f214bd822c54bd98bbef3ff
tree21ff2626a1304eb366f74cdbce22bb8bf8b2d5b0
parentef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4
parent6ea64f6225d623a23fee4d16965111e26ee74ffa
Merge commit 'origin/bug_383_softwaremanager' into experimental