Merged trunk changes r711:794 into BRANCH-EFREMOV-BASE
Authored by: formirror 2006-07-11
Parent: [r794]
Child: [r796]