diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
index cc01b73f6ee..4afbb314e8f 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import org.springframework.core.convert.support.GenericConversionService;
  */
 public class ConversionServiceFactoryBean implements FactoryBean<ConversionService>, InitializingBean {
 
-	private Set<Object> converters;
+	private Set<?> converters;
 
 	private GenericConversionService conversionService;
 
@@ -46,7 +46,7 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
 	 * {@link org.springframework.core.convert.converter.ConverterFactory},
 	 * or {@link org.springframework.core.convert.converter.GenericConverter}.
 	 */
-	public void setConverters(Set<Object> converters) {
+	public void setConverters(Set<?> converters) {
 		this.converters = converters;
 	}
 
diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
index cd4481898e6..161d27b7fc8 100644
--- a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
+++ b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public class FormattingConversionServiceFactoryBean
 	private static final boolean jodaTimePresent = ClassUtils.isPresent(
 			"org.joda.time.DateTime", FormattingConversionService.class.getClassLoader());
 
-	private Set<Object> converters;
+	private Set<?> converters;
 
 	private FormattingConversionService conversionService;
 
@@ -62,7 +62,7 @@ public class FormattingConversionServiceFactoryBean
 	 * {@link org.springframework.core.convert.converter.ConverterFactory},
 	 * or {@link org.springframework.core.convert.converter.GenericConverter}.
 	 */
-	public void setConverters(Set<Object> converters) {
+	public void setConverters(Set<?> converters) {
 		this.converters = converters;
 	}
 
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
index 6aa5b58aede..0b3664cf91f 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public abstract class ConversionServiceFactory {
 	 * {@link ConverterFactory}, or {@link GenericConverter}
 	 * @param registry the target registry to register with
 	 */
-	public static void registerConverters(Set<Object> converters, ConverterRegistry registry) {
+	public static void registerConverters(Set<?> converters, ConverterRegistry registry) {
 		if (converters != null) {
 			for (Object converter : converters) {
 				if (converter instanceof GenericConverter) {