Merge commit 'origin/pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 1 Nov 2010 14:42:03 +0000 (15:42 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 1 Nov 2010 14:42:03 +0000 (15:42 +0100)

Trivial merge