all further development will be in HEAD now everyone using the contacts_and_resources branch, update again to HEAD with: cvs update -dPA calendar