From: Brian Demsky <bdemsky@uci.edu>
Date: Wed, 19 Sep 2012 07:35:54 +0000 (-0700)
Subject: fix
X-Git-Tag: pldi2013~177^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=bd893aac350f125dc990f0ccd32b8e3cf133e2fb

fix
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
	model.cc
---

bd893aac350f125dc990f0ccd32b8e3cf133e2fb