Commit e9ca852e4d77e1b1723a2dceddfa2037677e2fb4

Russell Belfer 2012-08-23T09:20:17

Fix warnings and merge issues on Win64