[commit: dph] master: Merge branch 'master' of /Users/benl/devel/ghc/ghc-head/libraries/dph (8ae97fc)

[Ben Lippmeier]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8ae97fcaab7f7bb0239675e587612b693c492a01

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

commit 8ae97fcaab7f7bb0239675e587612b693c492a01
Merge: d139179... 883b2fe...
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed Apr 13 13:21:19 2011 +1000

    Merge branch 'master' of /Users/benl/devel/ghc/ghc-head/libraries/dph

 dph-common/Data/Array/Parallel.hs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)