Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 11 Jun 2013 13:54:51 +0000 (14:54 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 11 Jun 2013 13:54:51 +0000 (14:54 +0100)

Trivial merge