Merge branch 'CSPACE-5133'

author Richard Millet <remillet@berkeley.edu>

Tue, 15 May 2012 23:25:47 +0000 (16:25 -0700)

committer Richard Millet <remillet@berkeley.edu>

Tue, 15 May 2012 23:25:47 +0000 (16:25 -0700)
author Richard Millet <remillet@berkeley.edu>
Tue, 15 May 2012 23:25:47 +0000 (16:25 -0700)
committer Richard Millet <remillet@berkeley.edu>
Tue, 15 May 2012 23:25:47 +0000 (16:25 -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>
	Tue, 15 May 2012 23:25:47 +0000 (16:25 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Tue, 15 May 2012 23:25:47 +0000 (16:25 -0700)