From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 1 Dec 2012 01:35:00 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5498
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=194324f273b8a5d3ab52ed1abe32dc2a8aeb5cbe;p=tmp%2Fjakarta-migration.git

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

194324f273b8a5d3ab52ed1abe32dc2a8aeb5cbe