Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Thu, 20 Sep 2012 23:33:37 +0000 (16:33 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 20 Sep 2012 23:33:37 +0000 (16:33 -0700)
commitf05f7c754e5d8c7b1152ab2004761fc50a0596a8
treefdfae65de93f8864963f1e320b89c590f1dc8ca7
parentcc70bf77d41edb454ed2b725ae1fdafe716a0a37
parentb8f97b8e63effbd3b3de6bbf51d79f9da76b4085
Merge branch 'norris'
model.cc