Merge remote branch 'origin/pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 26 Jan 2011 15:15:08 +0000 (16:15 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 26 Jan 2011 15:15:08 +0000 (16:15 +0100)

Trivial merge