Merge remote branch 'remotes/origin/bug_600_softwaremanager_small_fixes'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 15 Oct 2010 11:19:32 +0000 (13:19 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 15 Oct 2010 11:19:32 +0000 (13:19 +0200)

Trivial merge