Merge remote branch 'refs/remotes/origin/mand1nga/rebrand'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 6 Jun 2010 13:47:02 +0000 (15:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 6 Jun 2010 13:47:02 +0000 (15:47 +0200)

Trivial merge