Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 2 May 2012 17:01:32 +0000 (18:01 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 2 May 2012 17:01:32 +0000 (18:01 +0100)
commit4202879d1270c2ada80ecaff83072a127ed8bd86
treef01c377c8936ab0ca41e202cb43fcd53f7e99556
parent84a9c46b9dd8a6f1fa7e24e2cf83a7e448f0e4e1
parentf7c265764245e48ea69295784d1b332ff928b196
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc