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

Trivial merge