Merge commit 'origin/pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 15 Nov 2010 12:20:26 +0000 (13:20 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 15 Nov 2010 12:20:26 +0000 (13:20 +0100)

Trivial merge