* Locale patch from Faidon: