From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 15 May 2012 23:25:47 +0000 (-0700)
Subject: Merge branch 'CSPACE-5133'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=84f48689abca7c4a5c1725bbd54f3359ceb45d1b;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5133'
---

84f48689abca7c4a5c1725bbd54f3359ceb45d1b