From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 3 May 2012 21:59:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/cspace-4813' into cspace-4813
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bcc2541009210b587cb2faefac48a92201e532d4;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/cspace-4813' into cspace-4813
---

bcc2541009210b587cb2faefac48a92201e532d4