Merge remote branch 'origin/pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Fri, 11 Feb 2011 12:30:40 +0000 (13:30 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Fri, 11 Feb 2011 12:30:40 +0000 (13:30 +0100)

Trivial merge