Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Wed, 27 Apr 2011 01:26:49 +0000 (18:26 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Wed, 27 Apr 2011 01:26:49 +0000 (18:26 -0700)

Trivial merge