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

Trivial merge