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

Merge branch 'CSPACE-5289'
---

f2412ca94fdbd77ff604e3670a14740b56c25cbd