SAM-1660 Patch for samigo to participate in archive/merge
Patch from Bruce Cota (Unicon), tweaks by AZ



git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@120835 66ffb92e-73f9-0310-93c1-f5514f145a0a