tree a65df16f8a7db7db0e018fb19d990a932dd44e4f
parent 5b8fd3c31a58b87b80605dca7a64fad6cb3f8a0f
author aappleby@google.com <aappleby@google.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> 1388438581 +0000
committer aappleby@google.com <aappleby@google.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> 1388438581 +0000

Merge patch to fix build under VS2010


git-svn-id: http://smhasher.googlecode.com/svn/trunk@151 77a7d1d3-4c08-bdc2-d393-d5859734b01a