[commit: containers] master: Merge changes release by GHC HQ as 0.7.4.1 (a9b7224)

[Paolo Capriotti]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a9b7224068ae60f73baacd5f76d2c27624d90120

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

commit a9b7224068ae60f73baacd5f76d2c27624d90120
Merge: 207010c... fff28d7...
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Thu May 3 08:29:06 2012 -0700

    Merge changes release by GHC HQ as 0.7.4.1
    
    Conflicts:
    	containers.cabal