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)
commitfc8c44e3d567a5a3cd1b373bd588015296a5a6f3
treeade3bfd91c7e92ed83ea79219ed773fbc009ee0e
parent703d64469eb2b607adcd864555b5fe1d981bf51f
parent52d3a48128b66e731afd54cec7cab0a687d303cf
Merge pull request #949 from laanwj/2012_03_vc2010compilefixes

VC2010 compile fixes