Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Thu, 16 Aug 2012 17:40:59 +0000 (10:40 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 16 Aug 2012 17:41:30 +0000 (10:41 -0700)
commit3519c47202090f3c4a69de0e89aaa2617b17ff75
treed834c49f8314964cd1ff04b02cbebfc02fe130bd
parent6c42e6f6e00d6283bce4e9086b111b4b78509ded
parent1f89a2b5691c26417c93d283e73e181bc6cea1a5
Merge branch 'norris'
model.cc