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

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

013c2784566b2422dfda3f44414c1920bf52169d