Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 23 Oct 2012 12:45:47 +0000 (13:45 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 23 Oct 2012 12:45:47 +0000 (13:45 +0100)

Trivial merge