Commit 4d83399d35f0d3d489c50f2358bd5481a90ddce5

Ben Straub 2012-07-27T11:55:58

Adjust for msvc pedantry.