Index: openacs-4/packages/news/tcl/news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v
diff -u -N -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/news/tcl/news-procs.tcl	15 Jun 2005 17:47:58 -0000	1.20.2.1
+++ openacs-4/packages/news/tcl/news-procs.tcl	7 Jul 2005 23:04:21 -0000	1.20.2.2
@@ -372,39 +372,39 @@
     rss_gen_report $subscr_id
 }
 
-namespace eval news::merge {
 
-    ad_proc -callback MergeShowUserInfo -impl news {
-	-user_id:required
-    } {
-	Show the news items 
-    } {
-	set msg "News items of $user_id"
-	ns_log Notice $msg
-	set result [list $msg]
 
-	set news [db_list_of_lists getaprovednews { *SQL* }]
+ad_proc -callback merge::MergeShowUserInfo -impl news {
+    -user_id:required
+} {
+    Show the news items 
+} {
+    set msg "News items of $user_id"
+    ns_log Notice $msg
+    set result [list $msg]
 
-	lappend result $news
+    set news [db_list_of_lists getaprovednews { *SQL* }]
 
-	return $result
-    }
+    lappend result $news
 
-    ad_proc -callback MergePackageUser -impl news {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the news of two users.
-    } {
-	set msg "Merging news"
-	ns_log Notice $msg
-	set result [list $msg]
+    return $result
+}
 
-	db_dml update_from_news_approval { *SQL* }
+ad_proc -callback merge::MergePackageUser -impl news {
+    -from_user_id:required
+    -to_user_id:required
+} {
+    Merge the news of two users.
+} {
+    set msg "Merging news"
+    ns_log Notice $msg
+    set result [list $msg]
 
-	lappend result "Merge of news is done"
+    db_dml update_from_news_approval { *SQL* }
 
-	return $result
-    }
+    lappend result "Merge of news is done"
 
+    return $result
 }
+
+