Merge pull request #1537 from bmiklautz/windowsbuild
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:31:27 +0000 (14:31 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:31:27 +0000 (14:31 -0700)
Windows build fixes


Trivial merge