Merge pull request #378 from syntheticpp/msvc-fixes
authorEvan Martin <martine@danga.com>
Fri, 27 Jul 2012 22:49:30 +0000 (15:49 -0700)
committerEvan Martin <martine@danga.com>
Fri, 27 Jul 2012 22:49:30 +0000 (15:49 -0700)
also build with msvc


Trivial merge