Merge branch 'master' into concept

author Ray Lee <rhlee@berkeley.edu>

Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)

committer Ray Lee <rhlee@berkeley.edu>

Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)
author Ray Lee <rhlee@berkeley.edu>
Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)
committer Ray Lee <rhlee@berkeley.edu>
Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)
diff --cc services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
Simple merge
author	Ray Lee <rhlee@berkeley.edu>
	Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)
committer	Ray Lee <rhlee@berkeley.edu>
	Tue, 27 Mar 2012 19:32:36 +0000 (12:32 -0700)