Merge branch 'CSPACE-5133'

author Richard Millet <remillet@berkeley.edu>

Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)

committer Richard Millet <remillet@berkeley.edu>

Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)
author Richard Millet <remillet@berkeley.edu>
Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)
committer Richard Millet <remillet@berkeley.edu>
Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Mon, 14 May 2012 21:45:12 +0000 (14:45 -0700)