Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 13:58:03 +0000 (14:58 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 13:58:03 +0000 (14:58 +0100)

Trivial merge