From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 9 Jun 2012 16:15:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into cspace-5271
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=97a9a56e410c18be0e7a767a094bb2be061d4eb9;p=tmp%2Fjakarta-migration.git

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

97a9a56e410c18be0e7a767a094bb2be061d4eb9