Merge branch 'master' into divVerent/gettextizing-the-source
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 20:25:07 +0000 (21:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 20:25:07 +0000 (21:25 +0100)

Trivial merge