Merge remote-tracking branch 'CVC4root/master'
authorTim King <taking@cs.nyu.edu>
Mon, 25 Nov 2013 23:41:06 +0000 (18:41 -0500)
committerTim King <taking@cs.nyu.edu>
Mon, 25 Nov 2013 23:41:06 +0000 (18:41 -0500)

Trivial merge