[Rolling window branch]
- integrated code review feedback from Kimi
Authored by: mteleru 2011-05-19
Parent: [r2126]
Child: [r2128]