From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 21 Jun 2012 06:44:53 +0000 (-0700)
Subject: Merge branch 'CSPACE-5300'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0c99b9e41d89a264e34abab2ee8baf6eee9a0935;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5300'
---

0c99b9e41d89a264e34abab2ee8baf6eee9a0935