Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 9 Jul 2013 10:06:17 +0000 (11:06 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 9 Jul 2013 10:06:17 +0000 (11:06 +0100)

Trivial merge