Merged r12:29 from /branches/dynamic_templates_support
Authored by: artyom-beilis 2007-11-22
Parent: [r30]
Child: [r32]