[project @ 2004-09-04 08:52:51 by as49]
[project @ 2004-09-04 08:52:51 by as49]

Removed conflict.

darcs-hash:20040904085251-d90cf-474e78356cf427f69a3eb422dc38e74d3f90980b.gz

thiagoarrais/gtk2hs,thiagoarrais/gtk2hs,thiagoarrais/gtk2hs