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)

Trivial merge