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)
commit6ff491caab739113f212543e4a70a0773cf6ce37
tree679d1c34d63e65d207467bc9086033486c363dd7
parent6f59909bea021e8eca6a60b6b76556b54d52fc49
parent3b57a6578fd6d09abb77c2eba4bd1e30660be59a
Merge commit 'origin/bug_590'