Merged changeset 1997 from stable branch, fixing:
- Fails in prefork mode - Lock file accidential removal
Authored by: artyom-beilis 2011-12-19
Parent: [r2023]
Child: [r2025]