Merge branch 'translations' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 28 Dec 2009 21:21:23 +0000 (22:21 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 28 Dec 2009 21:21:23 +0000 (22:21 +0100)

Trivial merge