Commit e02869807eea99ded75d389855699e86f0c8d7d5

Eric Zurcher 2012-08-15T16:30:10

More changes for Win32 compilation