Merge remote branch 'origin/pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Thu, 21 Apr 2011 14:36:38 +0000 (16:36 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 21 Apr 2011 14:36:38 +0000 (16:36 +0200)

Trivial merge