From: Richard Millet <remillet@berkeley.edu>
Date: Mon, 14 May 2012 21:45:12 +0000 (-0700)
Subject: Merge branch 'CSPACE-5133'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=1341e97afc2fb6e3e80d0488beec4e0acd5708dc;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5133'
---

1341e97afc2fb6e3e80d0488beec4e0acd5708dc