Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Mon, 30 Apr 2012 17:04:54 +0000 (18:04 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 30 Apr 2012 17:04:54 +0000 (18:04 +0100)

Trivial merge