From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 24 Jan 2013 20:10:24 +0000 (-0800)
Subject: Merge branch 'CSPACE-4876'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e8467c7e583afe89cf24b193324e4ef1d15cfa7e;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-4876'
---

e8467c7e583afe89cf24b193324e4ef1d15cfa7e