merged 1.6 branch r170:181 into the trunk
Authored by: serg_z 2006-06-15
Parent: [r181]
Child: [r183]