Merged trunk changes r1101:1104 from branch EFREMOV-BASE2 (firstline)
Authored by: ctapmex 2009-11-23
Parent: [r1126]
Child: [r1128]