Index: trunk/web-app/WEB-INF/applicationContext.xml
===================================================================
--- trunk/web-app/WEB-INF/applicationContext.xml	(revision 137)
+++ trunk/web-app/WEB-INF/applicationContext.xml	(revision 449)
@@ -16,9 +16,4 @@
         <property name="application" ref="grailsApplication" />
 	</bean>
-
-    <bean id="pluginMetaManager" class="org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager">
-        <property name="grailsApplication" ref="grailsApplication" />
-        <property name="resourcePattern" value="/WEB-INF/plugins/*/plugin.xml" />
-    </bean>
 
     <bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
Index: trunk/web-app/WEB-INF/sitemesh.xml
===================================================================
--- trunk/web-app/WEB-INF/sitemesh.xml	(revision 137)
+++ trunk/web-app/WEB-INF/sitemesh.xml	(revision 449)
@@ -2,9 +2,9 @@
     <page-parsers>
         <parser content-type="text/html"
-            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
+            class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
         <parser content-type="text/html;charset=ISO-8859-1"
-            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
+            class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
         <parser content-type="text/html;charset=UTF-8"
-            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />            
+            class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />            
     </page-parsers>
 
Index: trunk/web-app/WEB-INF/tld/grails.tld
===================================================================
--- trunk/web-app/WEB-INF/tld/grails.tld	(revision 137)
+++ trunk/web-app/WEB-INF/tld/grails.tld	(revision 449)
@@ -542,5 +542,5 @@
         </variable>
         <attribute>
-            <name>name</name>
+            <name>tagName</name>
             <required>true</required>
             <rtexprvalue>true</rtexprvalue>