Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 30 May 2013 19:40:10 +0000 (20:40 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 30 May 2013 19:40:10 +0000 (20:40 +0100)

Trivial merge