This commit was manufactured by cvs2svn to create branch 'cognovis'.

Cherrypick from master 2007-04-20 12:52:02 UTC cognovis 'Initial revision':
    www/users/merge.tcl
    www/users/merge-confirm.tcl
    www/users/merge-final.tcl
    www/users/user-batch-add-2.tcl
    www/users/user-batch-add.tcl
    tcl/merge-procs.tcl
Initial import for 3.3