Merged trunk changes r645:681 into BRANCH-EFREMOV-BASE.
Authored by: formirror 2006-03-12
Parent: [r681]
Child: [r683]