Commit e999caa4dc114d34fb34d2f2a338c6e1e0fba263

Con Kolivas 2013-04-21T20:28:28

Merge pull request #427 from gzm55/master compile on win32