Merge nb:ghc/git/ghc
authorIan Lynagh <igloo@earth.li>
Mon, 23 Apr 2012 15:11:46 +0000 (16:11 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 23 Apr 2012 15:11:46 +0000 (16:11 +0100)
commit09037d92a4efa344f66d5dd031b45b17645b6382
tree34f6967ef69017976dae46f772955b93a910663e
parente4de18dfed89b664a31727f69b9a47cc3966a4b5
parent74b9eb7284a15e67e1283138a0c861808c5a51c5
Merge nb:ghc/git/ghc