Commit ba696dce0b8edbc541f9dd013f3accb8c455206c

Nick Mathewson 2012-04-03T16:35:36

Merge remote-tracking branch 'vm/21_fix_nmake_build'