Merge branch 'hamed' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler