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

Trivial merge