Make sure you edit your config.php to remove the include of inc/template.php when you do a cvs update.
View entire thread