From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 20 Jun 2012 20:56:54 +0000 (-0700)
Subject: Merge branch 'CSPACE-4789'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f7a49fe3c2ce1119c104d7590f34aa993de82077;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-4789'
---

f7a49fe3c2ce1119c104d7590f34aa993de82077