From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 13 Dec 2012 20:26:33 +0000 (-0800)
Subject: Merge branch 'CSPACE-5657'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=08e062aab7a5a3d06f4428f67c20a3123c59756b;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5657'
---

08e062aab7a5a3d06f4428f67c20a3123c59756b