From 4214bc0735c66c669a50f6391b917c54854eea5c Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 25 Oct 2010 19:54:01 +0000
Subject: [PATCH] Minor post-merge cleanup

---
 .gitignore                                                      | 2 ++
 .../context/support/GenericXmlApplicationContext.java           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 020a89367b..052e3e4a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ org.springframework.test/test-output/
 build.sh
 org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
 org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs
+org.springframework.jdbc/derby.log
+spring-build
diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
index a0d45f8faa..24cc25e4ac 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
@@ -18,6 +18,7 @@ package org.springframework.context.support;
 
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
 /**