Include / Exclude Custom Search is broken

Attempt to run this custom search throws fatal error:
User warning: Smarty error: unable to read resource: "CRM/Contact/Form/Search/Custom/Group.tpl" in Smarty->trigger_error() (line 1093 of /Users/dgg/svn/crm_v4.2/packages/Smarty/Smarty.class.php).

Someone modified Group.php to use a specific tpl file - Group.tpl - which doesn't exist in SVN ??? If you revert that line to the 4.1 version ....

function templateFile()

{ return 'CRM/Contact/Form/Search/Custom.tpl'; }

... the search form loads BUT I think some of the new activity fields at the bottom of the form are missing (label only? - "Include activities" "Exclude activities"). Also the new buttons on the bottom don't seem to do anything ("Include activity targets","Exclude activity targets").