Merge commit 'origin/bug_550_fix_softwareupgradecounter'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:58:32 +0000 (09:58 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:58:32 +0000 (09:58 +0200)

Trivial merge