Merge branch 'master' of ssh://github.com/CVC4/CVC4
authorKshitij Bansal <kshitij@cs.nyu.edu>
Thu, 9 May 2013 21:47:53 +0000 (17:47 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Thu, 9 May 2013 21:47:53 +0000 (17:47 -0400)

Trivial merge