Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 3 Jul 2013 12:59:59 +0000 (13:59 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 3 Jul 2013 12:59:59 +0000 (13:59 +0100)

Trivial merge