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
This commit was manufactured by cvs2svn to create branch 'b3-4'.

Sprout from cognovis 2007-04-20 12:52:04 UTC cognovis 'Initial import for 3.3'
Cherrypick from master 2007-08-08 16:13:03 UTC podemo33 '- fixes during upgrade from 3.2.9 to 3.3':
    www/apm/version-generate-diffs.xql
    www/users/index.tcl
    tcl/apm-admin-procs.tcl
    www/send-email.tcl
    www/apm/parameter-edit-2.tcl
    www/apm/package-delete-2.tcl
    www/apm/parameter-add-2.tcl
    www/apm/version-callback-add-edit.tcl
    acs-admin.info
    www/apm/version-dependency-add.tcl
    www/auth/index.tcl
    www/cache/show-util-memoize.adp
    www/apm/packages-install-2.tcl
    www/apm/version-generate-info.tcl
    www/apm/version-i18n-index.tcl
    www/apm/version-parameter-values.tcl
    www/apm/package-delete.tcl
    www/apm/version-callback-delete.tcl
    www/apm/version-i18n.tcl
    www/apm/version-dependencies.tcl
    www/users/user-add-2.tcl
    www/apm/file-watch-cancel.tcl
    www/cache/show-util-memoize.tcl
    www/apm/package-scan.tcl
    www/install/install-4.tcl
    www/apm/version-enable.tcl
    www/apm/package-add-2.tcl
    www/index.tcl
    www/users/modify-admin-privileges.tcl
    www/test/signed-cookies-test-2.tcl
    www/apm/parameter-edit.tcl
    www/users/user-batch-add-2.tcl
    www/server-restart.tcl
    www/apm/version-reload.tcl
    www/users/search.tcl
    www/users/registration-history.tcl
    www/apm/package-load-2.tcl
    www/apm/version-view.tcl
    www/apm/packages-install.tcl
    www/auth/authority-set-sort-order.tcl
    www/apm/version-dependency-remove.tcl
    www/install/index.adp
    www/apm/file-watch.tcl
    www/apm/version-i18n-process-2.tcl
    www/users/password-update.tcl
    www/apm/version-tag.tcl
    www/apm/parameter-add.tcl
    www/apm/version-callback-invoke.tcl
    www/apm/build-repository.tcl
    www/apm/package-load.tcl
    www/apm/version-dependency-add-2.tcl
    www/apm/version-disable.tcl
    www/users/complex-search.tcl
    www/install/install.tcl
    www/apm/version-files.tcl
    www/apm/packages-install-3.tcl
    www/apm/version-i18n-export.tcl
    www/apm/package-add.tcl
    www/users/user-add.tcl
    www/test/signed-cookies-test.tcl
    www/apm/repository-channel-index.adp
    www/users/session-history.tcl
    www/apm/bulk-intall.tcl
    www/auth/authority.tcl
    www/users/user-add-3.tcl
    www/apm/version-edit-2.tcl
    www/developer.tcl
    www/users/member-state-change.tcl
    www/apm/packages-install-4.tcl
    www/users/sessions-one-month.tcl
    www/apm/version-i18n-process.tcl
    www/users/one.adp
    www/apm/version-upgrade.tcl
    www/apm/version-callbacks.tcl
    www/apm/version-generate-tarball.tcl
    www/apm/package-watch-cancel.tcl
    www/apm/version-generate-diffs.tcl
    www/users/index.adp
    www/apm/version-i18n-import.tcl
    www/apm/parameter-delete.tcl
    www/apm/package-deinstall.tcl
    www/apm/version-parameters.tcl
    www/users/one.tcl
    www/apm/write-all-specs.tcl
    www/users/sessions-registered-summary.tcl
    www/apm/cvs-status.tcl
    www/apm/package-watch.tcl
    www/apm/version-edit.tcl
    www/apm/index.tcl
    www/auth/batch-job.tcl
Delete:
    tcl/merge-procs.tcl
    tcl/merge-procs.xql