Merge branch 'master' of https://github.com/CVC4/CVC4
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 13 Sep 2013 20:08:56 +0000 (16:08 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 13 Sep 2013 20:08:56 +0000 (16:08 -0400)

Trivial merge