Merge branch 'pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 2 Dec 2010 17:21:29 +0000 (18:21 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 2 Dec 2010 17:21:29 +0000 (18:21 +0100)

Trivial merge