Merge patch to fix build under VS2010



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