Integrating the code review feedback (Thanks Kimi!) (step 2)
Authored by: acucu 2011-03-07
Parent: [r2023]
Child: [r2025]