Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Sun, 27 Mar 2011 19:37:04 +0000 (19:37 +0000)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 27 Mar 2011 19:37:04 +0000 (19:37 +0000)

Trivial merge