Merged forgotten trunk files into BRANCH-EFREMOV-BASE
Authored by: formirror 2006-07-12
Parent: [r798]
Child: [r800]