Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Thu, 27 Jan 2011 04:34:18 +0000 (20:34 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Thu, 27 Jan 2011 04:34:18 +0000 (20:34 -0800)
commitc428b5725b51d5e60a7c3216fc9084ba703760b8
treef2b018e53ddd2fd545b64c2e2ab323fa52ca581a
parent39f7c935dc2f5ba22a85a27e34ec86a0cc032fb3
parent9e6e96bdc19d71318ac7fc2fc9381ce57a22e399
Merge branch 'master' into type-nats

Conflicts:
compiler/main/DynFlags.hs
compiler/ghc.cabal.in
compiler/main/DynFlags.hs