Merge pull request #949 from laanwj/2012_03_vc2010compilefixes
authorWladimir J. van der Laan <laanwj@gmail.com>
Tue, 3 Apr 2012 18:35:33 +0000 (11:35 -0700)
committerWladimir J. van der Laan <laanwj@gmail.com>
Tue, 3 Apr 2012 18:35:33 +0000 (11:35 -0700)
VC2010 compile fixes


Trivial merge