diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java
index 9d705b700e..65c2bca725 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java
@@ -77,7 +77,7 @@ abstract class AbstractDateTimeAnnotationFormatterFactory<A extends Annotation>
 	// internal helpers
 	
 	private Set<Class<?>> createPropertyTypes() {
-		Set<Class<?>> propertyTypes = new HashSet<Class<?>>();
+		Set<Class<?>> propertyTypes = new HashSet<Class<?>>(5);
 		propertyTypes.add(ReadableInstant.class);
 		propertyTypes.add(ReadablePartial.class);
 		propertyTypes.add(Date.class);
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
index 1067c8de53..8fdd8aa81a 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
@@ -149,7 +149,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
 			valueType = getFieldType(field);
 		}
 		PropertyEditor editor = super.findEditor(field, valueType);
-		if (editor == null) {
+		if (editor == null && this.formattingService != null) {
 			TypeDescriptor td = (field != null ?
 					getPropertyAccessor().getPropertyTypeDescriptor(fixedField(field)) :
 					TypeDescriptor.valueOf(valueType));
diff --git a/org.springframework.core/.classpath b/org.springframework.core/.classpath
index 6f73abf26f..d4508b4e23 100644
--- a/org.springframework.core/.classpath
+++ b/org.springframework.core/.classpath
@@ -15,6 +15,5 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar" sourcepath="/IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-sources-3.2.7.jar"/>
 	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.joda/com.springsource.org.joda.time/1.6.0/com.springsource.org.joda.time-1.6.0.jar" sourcepath="/IVY_CACHE/org.joda/com.springsource.org.joda.time/1.6.0/com.springsource.org.joda.time-sources-1.6.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index 32c6e18edd..48cf8f9a43 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -26,7 +26,6 @@
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
 		<dependency org="org.jboss.vfs" name="com.springsource.org.jboss.virtual" rev="2.1.0.GA" conf="optional->compile"/>
-		<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>	
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
 		<!-- test dependencies -->
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index bd6948545f..ad0aaa9dc8 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -41,12 +41,6 @@
       <artifactId>aspectjweaver</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.6</version>
-      <optional>true</optional>
-    </dependency>    
     <dependency>
       <groupId>org.jboss.vfs</groupId>
       <artifactId>com.springsource.org.jboss.virtual</artifactId>
diff --git a/org.springframework.core/template.mf b/org.springframework.core/template.mf
index 2356019757..218e9ab926 100644
--- a/org.springframework.core/template.mf
+++ b/org.springframework.core/template.mf
@@ -10,7 +10,6 @@ Import-Template:
  org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
  org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.joda.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.jboss.virtual.*;version="[2.1.0.GA, 3.0.0)";resolution:=optional,
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional