Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Sat, 17 Mar 2012 14:57:14 +0000 (14:57 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 17 Mar 2012 14:57:14 +0000 (14:57 +0000)

Trivial merge