Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 16 Mar 2013 22:58:02 +0000 (22:58 +0000)
committerIan Lynagh <ian@well-typed.com>
Sat, 16 Mar 2013 22:58:02 +0000 (22:58 +0000)

Trivial merge