Merge branch 'pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 4 Apr 2011 15:05:49 +0000 (17:05 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 4 Apr 2011 15:05:49 +0000 (17:05 +0200)

Trivial merge