emmar
committed
on 16 Feb 07
Merging Nima's changes