[sakai] svn commit: r80585 - in portal/branches/sakai-2.7.1: . portal-impl/impl/src/java/org/sakaiproject/portal/charon/site portal-render-engine-impl/impl/src/java/org/sakaiproject/portal/charon/velocity

[arwhyte at umich.edu]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=80585

Author: arwhyte at umich.edu
Date: 2010-08-01 18:00:58 -0400 (Sun, 01 Aug 2010)
New Revision: 80585

Modified:
   portal/branches/sakai-2.7.1/
   portal/branches/sakai-2.7.1/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java
   portal/branches/sakai-2.7.1/portal-render-engine-impl/impl/src/java/org/sakaiproject/portal/charon/velocity/VelocityPortalRenderEngine.java
Log:
SAK-10771 merge trunk r79815