Merge remote-tracking branch 'upstream/master' into cspace-4814

author Aron Roberts <aron@socrates.berkeley.edu>

Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)

committer Aron Roberts <aron@socrates.berkeley.edu>

Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)
diff --cc services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Mon, 9 Apr 2012 18:11:02 +0000 (11:11 -0700)