Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 11 Jan 2012 01:52:38 +0000 (01:52 +0000)
committerIan Lynagh <igloo@earth.li>
Wed, 11 Jan 2012 01:52:38 +0000 (01:52 +0000)
commitb8fe21e9ba5486256c83784ca8b9a839b5c527f4
tree4fc645ca1e5c305f1950af8f9bb7507905c2f248
parent85fa980ff3ffcb477975a8ec3b4a37f47fdb0e8c
parente6bfc5962e7d889a9cafcf1829c5177206ccabfd
Merge branch 'master' of darcs.haskell.org/ghc