emmar
committed
on 15 Feb 07
Merging Nima's changes: i18n