From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 14 Aug 2012 21:21:18 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5271
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=83b469febd1f6c063146f048430803bf14e903b3;p=tmp%2Fjakarta-migration.git

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

83b469febd1f6c063146f048430803bf14e903b3