Merge commit 'origin/translations' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 29 Dec 2009 21:31:42 +0000 (22:31 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 29 Dec 2009 21:31:42 +0000 (22:31 +0100)

Trivial merge