tree 9ccb65f350224d1c0dd2ceffc72e0e869ecfb347
parent b27e5b6bffe449357d6917876ca875101594de5a
parent 6ad418729fe02896a89da1399f65d080c6f642a1
author Christopher Frost <frostc@vmware.com> 1296752294 +0000
committer Christopher Frost <frostc@vmware.com> 1296752294 +0000

Merge branch 'master' into jetty-support

Conflicts:
	org.eclipse.virgo.web.core/.classpath
	org.eclipse.virgo.web.core/ivy.xml
	org.eclipse.virgo.web.tomcat/.classpath
	org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan