Merge branch 'translations'
authorMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 19:16:28 +0000 (30 20:16 +0100)
committerMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 19:16:28 +0000 (30 20:16 +0100)

Trivial merge