Merge branch 'translations' into 2.7
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 13:31:44 +0000 (14:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 13:31:44 +0000 (14:31 +0100)

Trivial merge