Merge remote-tracking branch 'upstream/master'

author Rick Jaffe <rjaffe@berkeley.edu>

Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)

committer Rick Jaffe <rjaffe@berkeley.edu>

Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)
author Rick Jaffe <rjaffe@berkeley.edu>
Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)
committer Rick Jaffe <rjaffe@berkeley.edu>
Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Rick Jaffe <rjaffe@berkeley.edu>
	Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)
committer	Rick Jaffe <rjaffe@berkeley.edu>
	Tue, 3 Apr 2012 20:21:34 +0000 (13:21 -0700)