Merge remote-tracking branch 'origin/win32_fixes'
authorMichael Rash <mbr@cipherdyne.org>
Mon, 6 May 2013 00:59:04 +0000 (20:59 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Mon, 6 May 2013 00:59:04 +0000 (20:59 -0400)
This fixes issue #69 thanks to Damien.


Trivial merge