Merge branch 'brian' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...