--- /dev/null
+--- build.xml.sav 2005-10-13 11:31:30.000000000 +0200
++++ build.xml 2005-11-12 14:15:58.000000000 +0100
+@@ -41,6 +41,7 @@
+ <pathelement location="${build.home}/classes"/>\r
+ <fileset dir="./lib">\r
+ <include name="*.jar"/>\r
++ <exclude name="asm2*.jar"/>\r
+ </fileset>\r
+ </path>\r
+ \r
+@@ -123,14 +124,18 @@
+ <exclude name="samples/**" />\r
+ </jar> \r
+ \r
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>\r
+- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >\r
+- <zipfileset dir="lib" includes="asm*.txt"/>\r
+- <zipfileset src="lib/asm.jar" excludes="META-INF"/>\r
+- <zipfileset src="lib/asm-attrs.jar" excludes="META-INF"/>\r
++ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar.jar:lib/asm2_asm2.jar"/>\r
++ <echo message="${dist.home}/${component.name}-nodep-${component.version}.jar" />\r
++ <echo message="${build.home}/classes"/>\r
++ <jarjar destfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >\r
++ <fileset dir="lib" includes="asm*.txt"/>\r
++ <zipfileset src="lib/asm_asm.jar" excludes="META-INF"/>\r
++ <zipfileset src="lib/asm_asm-attrs.jar" excludes="META-INF"/>\r
+ <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>\r
+- <include name="**/*"/>\r
+- <exclude name="samples/**"/>\r
++ <fileset dir="${build.home}/classes">\r
++ <include name="**/*"/>\r
++ <exclude name="samples/**"/>\r
++ </fileset>\r
+ </jarjar> \r
+ </target>\r
+ \r
+@@ -259,6 +264,7 @@
+ <pathelement path="${samples.build.home}/classes" /> \r
+ <fileset dir="./lib">\r
+ <include name="*.jar"/>\r
++ <exclude name="asm2*.jar"/>\r
+ </fileset>\r
+ </classpath>\r
+ </java>\r