[commit: base] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base (5ef21eb)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5ef21eb3d6acf2b156c0da27947b36ba2774c1f3

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

commit 5ef21eb3d6acf2b156c0da27947b36ba2774c1f3
Merge: a8b47d5... 3054cf9...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jul 19 20:38:46 2012 +0100

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

 Data/Ord.hs |   11 +++++++++++
 GHC/Exts.hs |   13 ++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)