[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (96ce0b0)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/96ce0b026eb95ae19a9d4a7df2601f299576f84a

>---------------------------------------------------------------

commit 96ce0b026eb95ae19a9d4a7df2601f299576f84a
Merge: 807c294... 84742c0...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 21 16:49:39 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/hsSyn/HsDecls.lhs     |   17 ++++++++++++++---
 compiler/typecheck/TcDeriv.lhs |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)