Merge commit 'origin/bug_590'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 6 Oct 2010 09:19:05 +0000 (11:19 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 6 Oct 2010 09:19:05 +0000 (11:19 +0200)

Trivial merge