Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Sat, 27 Aug 2011 16:06:17 +0000 (12:06 -0400)
committerMatt McCutchen <matt@mattmccutchen.net>
Sat, 27 Aug 2011 16:06:17 +0000 (12:06 -0400)
commit86e209954803086a9a880fe3cd538d2c866cb8d6
tree611222c918935620c57b2f10159431467cca421d
parentdf3d7779b79713973898f91d7bd9d418bf41eebe
parentbbabbd0161ab6e633f7d7027e0167892633519f7
Merge branch 'master' into popl2012

Some changes were upstreamed into master, sometimes with further
improvements.  Merging them back.

Conflicts:
program/Evaluation.hs
program/Main.hs
program/Makefile
program/TestUtils.hs
program/example.in
program/Main.hs