From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 22 Jun 2012 16:51:03 +0000 (-0700)
Subject: Merge branch 'CSPACE-5300'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d52f460153a009683ff2fe8c5578e9b237f0d6bd;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5300'
---

d52f460153a009683ff2fe8c5578e9b237f0d6bd