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)
commit7ef5b2939076902ee54c9f1a2c50d55b274e4388
treec0f5c8efd29af870601787e26a2e3ef9dc0f669b
parent38c8b565ff8d8011e26af8ae4b03800ca29d3f38
parentddd3c5199fd40386c6385689fdf5c542f831bcf0
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/utils/Platform.hs