Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Jan 2013 16:46:40 +0000 (16:46 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Jan 2013 16:46:40 +0000 (16:46 +0000)
commit82f81d1272f2774d1d2b19aa620fa084f77d4bec
treec68a041e920ef779e6145681e144123ee9b5502c
parentdeec5b74dee7f676b8a9f840ec7b5a813e7e0956
parent12f3a53edf3db4eabcbe412cab0ef44b469b537e
Merge branch 'master' of darcs.haskell.org/ghc