[commit: directory] encoding: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/directory into encoding (41ea326)

[Max Bolingbroke]

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

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/41ea326cc6ca3077c94983c546d5f04850855799

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

commit 41ea326cc6ca3077c94983c546d5f04850855799
Merge: bbe0683... 69c8d99...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Mon Apr 11 17:18:21 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/directory into encoding

 directory.cabal |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)