Merge commit 'origin/bug_600_softwaremanager_small_fixes' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Wed, 13 Oct 2010 08:09:01 +0000 (10:09 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 13 Oct 2010 08:09:01 +0000 (10:09 +0200)

Trivial merge