Merge remote-tracking branch 'local/msvc-updates' into msvc-updates
authorJonathan Chambers <joncham@gmail.com>
Wed, 7 Mar 2012 20:34:38 +0000 (15:34 -0500)
committerJonathan Chambers <joncham@gmail.com>
Wed, 7 Mar 2012 20:34:38 +0000 (15:34 -0500)

Trivial merge