Index: site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
===================================================================
--- site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(revision 934)
+++ site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(revision 935)
@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.Random;
 import java.util.Set;
@@ -2933,10 +2934,11 @@
 				context.put("description", state
 						.getAttribute(STATE_GROUP_DESCRIPTION));
 			}
-			Iterator siteMembers = new SortedIterator(getParticipantList(state)
-					.iterator(), new SiteComparator(SORTED_BY_PARTICIPANT_NAME,
-					Boolean.TRUE.toString()));
-			if (siteMembers != null && siteMembers.hasNext()) {
+			Collection partList = getParticipantList(state);
+			if(partList != null) {
+				Set siteMembers = new TreeSet(new SiteComparator(SORTED_BY_PARTICIPANT_NAME,
+						Boolean.TRUE.toString()));
+				siteMembers.addAll(partList);
 				context.put("generalMembers", siteMembers);
 			}
 			Set groupMembersSet = (Set) state.getAttribute(STATE_GROUP_MEMBERS);
@@ -2948,6 +2950,24 @@
 			context.put("groupMembersClone", groupMembersSet);
 			context.put("userDirectoryService", UserDirectoryService
 					.getInstance());
+			
+			Collection groups2 = site.getGroups();
+			
+			HashMap<String, Collection<String>> userGroupsMap = new HashMap<String, Collection<String>>(); 
+			for (Object g2 : groups2) {
+				Group group2 = (Group) g2;
+				for (Object m2 : group2.getMembers()) {
+					Member member = (Member)m2;
+					String uid = member.getUserId();
+					if(userGroupsMap.get(uid) == null) 
+						userGroupsMap.put(uid, new TreeSet<String>());
+					
+					userGroupsMap.get(uid).add(group2.getTitle());
+				}
+			}
+			
+			context.put("userGroupsMap", userGroupsMap);
+			
 			return (String) getContext(data).get("template") + TEMPLATE[50];
 		case 51:
 			/*
Index: site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
===================================================================
--- site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties	(revision 934)
+++ site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties	(revision 935)
@@ -136,6 +136,7 @@
 editgroup.site.permission.alert=You are not allowed to make changes to the site.
 editgroup.titlemissing=You need to specify the group title.
 editgroup.update=Update
+editgroup.userismember=is a member of the following groups:
 enw.custom=Customize Tools
 enw.custom1=Customize these tools for your site now. You can also make adjustments later in the site using the Edit Tools item in the Site Info tool.
 enw.custom2=Customize these tools for your site.
Index: site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-groupedit.vm
===================================================================
--- site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-groupedit.vm	(revision 934)
+++ site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-groupedit.vm	(revision 935)
@@ -13,6 +13,24 @@
 			theForm.submit();
 		}
 	}
+	
+	function fixMyDiv() {
+		var list1 = $('select');
+		for (var j = 0 ; j < list1.length ; j++) {
+		var options = list1.get(j);
+			for (var i = 0 ; i < options.length ; i++) {	
+				var elem = options[i];
+				var div = document.getElementById(elem.value);
+				if(div) {
+					if(elem.selected) {
+						$(div).show();
+					} else {
+						$(div).hide();
+					}
+				}
+			}
+	 	}
+	}
 </script>
 <div class ="portletBody">
 	<h3>
@@ -63,7 +81,7 @@
 			</tr>
 			<tr>
 				<td align="center" colspan="2">
-					<select name="generallist" multiple="multiple" size="20" ondblclick="javascript:document.getElementById('groupForm').action='#toolLinkParam('$action' 'doGroup_update' 'option=add')';submitform('groupForm');">
+					<select name="generallist" multiple="multiple" size="20" onchange="javascript:fixMyDiv();" ondblclick="javascript:document.getElementById('groupForm').action='#toolLinkParam('$action' 'doGroup_update' 'option=add')';submitform('groupForm');">
     		#foreach ($member in $generalMembers)
 							#set($found=false)
 							#foreach ($gM in $groupMembersClone)
@@ -78,7 +96,7 @@
     	</select>
 				</td>
 				<td align="center" colspan="2">
-					<select name="grouplist" multiple="multiple" size="20" ondblclick="javascript:document.getElementById('groupForm').action='#toolLinkParam('$action' 'doGroup_update' 'option=remove')';submitform('groupForm');">
+					<select name="grouplist" multiple="multiple" onchange="javascript:fixMyDiv();" size="20" ondblclick="javascript:document.getElementById('groupForm').action='#toolLinkParam('$action' 'doGroup_update' 'option=remove')';submitform('groupForm');">
 						#foreach ($gmember in $groupMembers)
     			#set($gUser = $!userDirectoryService.getUser($gmember.UserId))
 							#if ($!gUser)
@@ -87,6 +105,22 @@
     		#end
     	</select>
 				</td>
+				<td>
+    				#foreach ($member in $generalMembers)
+    					#if ($userGroupsMap.get($member.Uniqname))
+							<div id="$member.Uniqname" name="member">
+							    <p class="shorttext">
+							    	$member.Name ($member.DisplayId) $tlang.get('editgroup.userismember')
+							    	#foreach ($group in $userGroupsMap.get($member.Uniqname))
+										<br>
+							       		$group
+							    	#end
+							    </p>
+							</div>
+						#end
+					#end
+				</td>
+				
 			</tr>
 </tbody>
 		</table>		
@@ -98,3 +132,8 @@
 		</div>
 	</form>
 </div>
+<script type="text/javascript">
+// <![CDATA[
+  fixMyDiv();
+// ]]>
+</script> 
\ No newline at end of file