Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 15 May 2013 14:29:30 +0000 (15:29 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 15 May 2013 14:29:30 +0000 (15:29 +0100)

Trivial merge