Merging change made in branches/2.0-M1 forward to trunk.  See commit 486974 log entry for detailed information.  This fixes a problem when running tests and a method not found error occurring during org.apache.geronimo.jetty6.GBeanInfoTest
Merging change made in branches/2.0-M1 forward to trunk.  See commit 486974 log entry for detailed information.  This fixes a problem when running tests and a method not found error occurring during org.apache.geronimo.jetty6.GBeanInfoTest

git-svn-id: 0d16bf2c240b8111500ec482b35765e5042f5526@486979 13f79535-47bb-0310-9956-ffa450edef68

apache/geronimo,apache/geronimo,apache/geronimo,apache/geronimo