Merge remote branch 'origin/pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 4 May 2011 20:35:58 +0000 (22:35 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 4 May 2011 20:35:58 +0000 (22:35 +0200)

Trivial merge