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)

Trivial merge