Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Mon, 4 Mar 2013 00:40:38 +0000 (00:40 +0000)
committerIan Lynagh <ian@well-typed.com>
Mon, 4 Mar 2013 00:40:38 +0000 (00:40 +0000)

Trivial merge