hamiltonc
committed
on 22 Jul 05
fix a conflict in dotlrn-ecommerce.info