From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 25 Sep 2012 22:47:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5552
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=89cb877c8cc2030a8f21841a8b157b3c55214cff;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into CSPACE-5552
---

89cb877c8cc2030a8f21841a8b157b3c55214cff