Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 19 Oct 2011 13:17:47 +0000 (14:17 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 19 Oct 2011 13:17:47 +0000 (14:17 +0100)
Conflicts:
compiler/utils/Platform.hs


Trivial merge