Templates are updated according to new API
Authored by: artyom-beilis 2008-10-05
Parent: [r441]
Child: [r443]