Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	20 Apr 2004 21:13:04 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	4 Jun 2006 00:45:47 -0000	1.7
@@ -42,10 +42,12 @@
                     
                     # Add user to public group - see bug 1468
                     group::add_member \
+                        -no_perm_check \
                         -group_id [acs_magic_object the_public] \
                         -user_id $rel_user_id                    
                 }
                 "needs approval" { db_exec_plsql unapprove {} }
+                "merged" { db_exec_plsql merge {} }
             }
 
             # Record who changed the state