From: Richard Millet <remillet@berkeley.edu>
Date: Mon, 24 Sep 2012 23:32:43 +0000 (-0700)
Subject: Merge branch 'CSPACE-5540-REM'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a7df1804ca861399144051e065a11bb166b4af3e;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5540-REM'
---

a7df1804ca861399144051e065a11bb166b4af3e