Merge pull request #5 from mjmvisser/master
authorWladimir J. van der Laan <laanwj@gmail.com>
Mon, 20 Jun 2011 15:17:31 +0000 (08:17 -0700)
committerWladimir J. van der Laan <laanwj@gmail.com>
Mon, 20 Jun 2011 15:17:31 +0000 (08:17 -0700)
mac fixes


Trivial merge