Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sun, 3 Feb 2013 15:43:16 +0000 (15:43 +0000)
committerIan Lynagh <ian@well-typed.com>
Sun, 3 Feb 2013 15:43:16 +0000 (15:43 +0000)

Trivial merge