Merge branch 'pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:14:22 +0000 (16:14 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:14:22 +0000 (16:14 +0200)

Trivial merge