Merge r600185 from trunk: Fix bug 43594. Use setenv from CATALINA_BASE (if set) in preference to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. Submitted by: markt Reviewed by: jim
tomcat/tc6.0.x/trunk/RUNNING.txt