Merge changes did between 2227 and 2418.
Authored by: otavio 2005-10-29
Parent: [r2418]
Child: [r2420]