[commit: containers] master: Merge branch 'master' of github.com:haskell/containers (6ab2ba0)

[Paolo Capriotti]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6ab2ba0aada982256cb204c6e28846d846e97a6b

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

commit 6ab2ba0aada982256cb204c6e28846d846e97a6b
Merge: 7332813... 9d72ff1...
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Apr 14 19:04:41 2012 +0200

    Merge branch 'master' of github.com:haskell/containers

 Data/IntMap/Base.hs   |   20 +++++++++++++++++---
 Data/IntMap/Lazy.hs   |    1 +
 Data/IntMap/Strict.hs |    1 +
 Data/Map/Base.hs      |   20 +++++++++++++++++---
 Data/Map/Lazy.hs      |    1 +
 Data/Map/Strict.hs    |    1 +
 6 files changed, 38 insertions(+), 6 deletions(-)