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

Trivial merge