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

Merge branch 'CSPACE-5305'
---

ee39c34243587038baed44969cd749b332f7675f