Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 31 Oct 2012 00:25:55 +0000 (01:25 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 31 Oct 2012 00:25:55 +0000 (01:25 +0100)

Trivial merge