Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 30 Nov 2011 02:26:13 +0000 (02:26 +0000)
committerIan Lynagh <igloo@earth.li>
Wed, 30 Nov 2011 02:26:13 +0000 (02:26 +0000)

Trivial merge