Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)
commitf943e217277aeabf50653915f977ef168797021c
treec1513e3c3e2f6a27572c63f1637182bd0f6fc597
parentcb03dbdaf2d3316dc8bc2e9a4ae373c99f4b61de
parentc185cf2bd088b8435ef16ae1599b192a88d02bc8
Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'