Merge remote-tracking branch 'upstream/master' into Place-authority

author Rick Jaffe <rjaffe@berkeley.edu>

Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)

committer Rick Jaffe <rjaffe@berkeley.edu>

Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)
author Rick Jaffe <rjaffe@berkeley.edu>
Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)
committer Rick Jaffe <rjaffe@berkeley.edu>
Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Rick Jaffe <rjaffe@berkeley.edu>
	Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)
committer	Rick Jaffe <rjaffe@berkeley.edu>
	Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)