Fix conflicts.  Fix for changed argument to 'preprocessSources'.
Fix conflicts.  Fix for changed argument to 'preprocessSources'.


20070728223322-75a80-c24bb8634c459b523cbe7f5bf0fe0daf547eae39.gz

dcreager/cabal,dcreager/cabal