From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Tue, 15 May 2012 15:26:35 +0000 (-0700)
Subject: Merge branch 'CSPACE-5059'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=57489eb0d8ed75da5ad82ec2429259504778a29d;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5059'
---

57489eb0d8ed75da5ad82ec2429259504778a29d