dabase/ e/ Merging changes from your HEAD branch to your other branches

Carefully file by file.

cvs update -j HEAD deploy.sh