From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 25 Jul 2012 18:52:32 +0000 (-0700)
Subject: Merge branch 'CSPACE-5381'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bb42357f5dc7151502bc35085b3562d695a2a524;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5381'
---

bb42357f5dc7151502bc35085b3562d695a2a524