From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 26 Mar 2013 23:53:26 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5943
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=114dcbfb6432f21f591773d1d9889762305bdd89;p=tmp%2Fjakarta-migration.git

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

114dcbfb6432f21f591773d1d9889762305bdd89