fix merge errors
[ghc-hetmet.git] / InstallShield / Shell Objects /
2006-04-07 Simon MarlowReorganisation of the source tree