Merge remote-tracking branch 'upstream/master' into CSPACE-5271

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

Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)

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

Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
diff --cc services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)