[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (7849266)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/7849266ce2a9f45633d41532a07d870ea6a27fbb

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

commit 7849266ce2a9f45633d41532a07d870ea6a27fbb
Merge: 26c7d94 ac330cb
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu May 30 20:40:10 2013 +0100

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

 compiler/basicTypes/MkId.lhs      | 56 ++++++++++++++++++++++++++++++++++++---
 compiler/basicTypes/MkId.lhs-boot |  2 ++
 compiler/prelude/PrelNames.lhs    |  3 +++
 compiler/prelude/PrelRules.lhs    | 25 ++++++++++++++---
 4 files changed, 80 insertions(+), 6 deletions(-)