Merge commit 'origin/mand1nga/rebrand'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:23:15 +0000 (14:23 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:23:15 +0000 (14:23 +0200)

Trivial merge