Merge branch 'translations'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 18 Nov 2009 18:07:32 +0000 (19:07 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 18 Nov 2009 18:07:32 +0000 (19:07 +0100)

Trivial merge