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

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

ff34345ad59d29412d76add8fd34db155339c89b