Merge branch 'master' into concept

author Ray Lee <rhlee@berkeley.edu>

Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)

committer Ray Lee <rhlee@berkeley.edu>

Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)
author Ray Lee <rhlee@berkeley.edu>
Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)
committer Ray Lee <rhlee@berkeley.edu>
Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Ray Lee <rhlee@berkeley.edu>
	Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)
committer	Ray Lee <rhlee@berkeley.edu>
	Tue, 27 Mar 2012 01:40:28 +0000 (18:40 -0700)