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

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

Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)

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

Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Sat, 9 Jun 2012 01:01:16 +0000 (18:01 -0700)