Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 18 Nov 2011 19:07:33 +0000 (19:07 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 18 Nov 2011 19:07:33 +0000 (19:07 +0000)

Trivial merge