Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 20 Jan 2012 12:47:25 +0000 (12:47 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 20 Jan 2012 12:47:25 +0000 (12:47 +0000)

Trivial merge