Merge remote branch 'remotes/origin/pootle-import'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 14:19:35 +0000 (15:19 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 14:19:35 +0000 (15:19 +0100)

Trivial merge