Merge remote branch 'origin/bug_383_softwaremanager'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 27 Jan 2010 09:50:25 +0000 (10:50 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 27 Jan 2010 09:50:25 +0000 (10:50 +0100)

Trivial merge