Merged revisions 23072 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r23072 | kohsuke | 2009-10-22 17:11:50 -0700 (Thu, 22 Oct 2009) | 1 line
  
  fixed a collision in Groovy MetaClass implementation from json-lib
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23073 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -347,7 +347,7 @@ THE SOFTWARE.
     <dependency><!-- until we get this version through Stapler -->
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>json-lib</artifactId>
-      <version>2.1-rev3</version>
+      <version>2.1-rev4</version>
     </dependency>
     <dependency>
       <groupId>args4j</groupId>