Merge remote branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 19 Feb 2011 21:51:31 +0000 (13:51 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 19 Feb 2011 21:51:31 +0000 (13:51 -0800)
1  2 
compiler/main/DynFlags.hs
compiler/typecheck/TcSplice.lhs

Simple merge
Simple merge