hamiltonc
committed
on 23 Aug 05
resolve merge conflicts on dotrn-ecommerce.info