Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Mon, 31 Oct 2011 05:52:02 +0000 (22:52 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Mon, 31 Oct 2011 05:52:02 +0000 (22:52 -0700)

Trivial merge