Cleaned up and merged diff templatization patch from Cristoper Lenz (Thanks
for the patch!). Fixes #310.
Authored by: daniel 2004-05-10
Parent: [r480]
Child: [r482]