From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 30 May 2012 22:31:28 +0000 (-0700)
Subject: Merge branch 'CSPACE-5289'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=62f5160bb8c4285336fefa592d58cca23ff0b97a;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5289'
---

62f5160bb8c4285336fefa592d58cca23ff0b97a