Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	13 Jun 2005 20:43:09 -0000	1.1.2.5
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	3 Nov 2006 21:27:54 -0000	1.1.2.6
@@ -32,7 +32,7 @@
 if { !$merge_p } {
     ad_returnredirect "/acs-admin/users"
 } else {
-    set final_results [callback MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
+    set final_results [callback merge::MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
 
     set results "<ul>"
     foreach item $final_results {
Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/acs-admin/www/users/merge.tcl	13 Jun 2005 20:43:09 -0000	1.1.2.4
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	3 Nov 2006 21:27:54 -0000	1.1.2.5
@@ -38,7 +38,7 @@
     set one_item_object_url  "[site_node::get_url_from_object_id -object_id $object_id]"
 }
 
-set user_id_one_items [callback MergeShowUserInfo -user_id $user_id ]
+set user_id_one_items [callback merge::MergeShowUserInfo -user_id $user_id ]
 if { ![empty_string_p $user_id_one_items] } {
     set user_id_one_items_html "<ul><li><b>Packages User Information </b><ul>"
     foreach pkg_list $user_id_one_items {
@@ -69,7 +69,7 @@
     set two_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]"
 }
 
-set user_id_two_items [callback MergeShowUserInfo -user_id $user_id_from_search ]
+set user_id_two_items [callback merge::MergeShowUserInfo -user_id $user_id_from_search ]
 if { ![empty_string_p $user_id_two_items] } {
     set user_id_two_items_html "<ul><li><b>Packages User Information </b><ul>"
     foreach pkg_list $user_id_two_items {