Merge remote branch 'origin/bug_503_softwaremanager_catch_feederror' into 2.8
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:40:34 +0000 (18:40 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:40:34 +0000 (18:40 +0200)

Trivial merge