Merge remote branch 'refs/remotes/origin/merlijn/osx-logo'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 8 Aug 2010 19:32:46 +0000 (21:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 8 Aug 2010 19:32:46 +0000 (21:32 +0200)

Trivial merge