When you deliver to a new client, do you separate an independent branch to develop on it? Is this branch merged into trunk? or do you keep separate base codes per client/project?