Merge branch 'master' into CSPACE-5129

author Richard Millet <remillet@berkeley.edu>

Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -0700)

committer Richard Millet <remillet@berkeley.edu>

Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -0700)
author Richard Millet <remillet@berkeley.edu>
Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -0700)
committer Richard Millet <remillet@berkeley.edu>
Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -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>
	Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Wed, 13 Jun 2012 22:43:30 +0000 (15:43 -0700)