Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Mon, 19 Dec 2011 17:42:09 +0000 (17:42 +0000)
committerIan Lynagh <igloo@earth.li>
Mon, 19 Dec 2011 17:42:09 +0000 (17:42 +0000)

Trivial merge