Merge remote branch 'origin/divVerent/pangofix'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 5 Dec 2010 15:52:23 +0000 (16:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 5 Dec 2010 15:52:23 +0000 (16:52 +0100)

Trivial merge