A wrapper to help with merging changes between various cvs branches