[commit: directory] master: Merge commit 'f2ea0c2' (7951291)

[Max Bolingbroke]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7951291d7a2caff695d957afafe45927729b9c3d

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

commit 7951291d7a2caff695d957afafe45927729b9c3d
Merge: 307a30f... f2ea0c2...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Sat Nov 19 11:23:22 2011 +0000

    Merge commit 'f2ea0c2'
    
    Conflicts:
    	System/Directory.hs

 System/Directory.hs |   44 ++++++++++++++++++--------------------------
 1 files changed, 18 insertions(+), 26 deletions(-)