Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-admin/www/users/one.adp	13 Jan 2005 13:54:41 -0000	1.17
+++ openacs-4/packages/acs-admin/www/users/one.adp	4 Jun 2006 00:45:20 -0000	1.18
@@ -77,6 +77,17 @@
   <li><a href="modify-admin-privileges?user_id=@user_id@&action=grant">Grant site-wide administration privileges</a></li>
 </else>
 
+<li>Merge this user with:
+   <form method=get action=search>
+    <input type="hidden" name="target" value="merge" />
+    <input type="hidden" name="limit_to_user_id" value="@user_id@" />
+    <input type="hidden" name="from_user_id" value="@user_id@" />
+    <input type="hidden" name="only_authorized_p" value="0" />
+    <input type="text" size="15" name="keyword" />
+    <input type="submit" value="Find User" />
+  </form>
+ </li>
+
 <if @password_reset_url@ not nil>
   <li><a href="@password_reset_url@">Reset this user's password</a></li>
 </if>