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

Trivial merge