Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:43 +0000 (14:24 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:43 +0000 (14:24 +0100)
1  2 
compiler/typecheck/TcInstDcls.lhs
docs/users_guide/glasgow_exts.xml

Simple merge
Simple merge