Merged 439:471 from /branches/new-templates
Merged templates branch
Authored by: artyom-beilis 2008-10-18
Parent: [r471]
Child: [r473]