Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:27:16 +0000 (23:27 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:27:16 +0000 (23:27 +0000)

Trivial merge