Merge commit 'origin/bug_503_softwaremanager_catch_feederror'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 14 Apr 2010 08:25:47 +0000 (10:25 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 14 Apr 2010 08:25:47 +0000 (10:25 +0200)

Trivial merge