Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 22 Jun 2013 21:31:30 +0000 (22:31 +0100)
committerIan Lynagh <ian@well-typed.com>
Sat, 22 Jun 2013 21:31:30 +0000 (22:31 +0100)

Trivial merge