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

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

5e8f146ddac81bdaa1dd5a1abf05eedfa5dc44df