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

Trivial merge