Index: ivysettings.xml
===================================================================
--- ivysettings.xml	(revision 537745)
+++ ivysettings.xml	(working copy)
@@ -16,9 +16,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivyconf>
+<ivysettings>
 	<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
-	<conf defaultResolver="public" />
+	<settings defaultResolver="public" />
 	<resolvers>
 		<!--  
 			we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts
@@ -32,4 +32,4 @@
 			<artifact pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
 		</url>
 	</resolvers>
-</ivyconf>
+</ivysettings>