Merge commit 'origin/bug_563_fix_backuprestore_crash'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:59:08 +0000 (12:59 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:59:08 +0000 (12:59 +0200)

Trivial merge