NOJIRA

Stashing a bit more progress.



git-svn-id: https://source.sakaiproject.org/svn/portal/branches/trinity@132885 66ffb92e-73f9-0310-93c1-f5514f145a0a