Merge pull request #177 from doctorlove/msvc_changes
authorEvan Martin <martine@danga.com>
Tue, 3 Jan 2012 15:36:38 +0000 (07:36 -0800)
committerEvan Martin <martine@danga.com>
Tue, 3 Jan 2012 15:36:38 +0000 (07:36 -0800)
Msvc changes


Trivial merge