From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 29 May 2013 02:24:34 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6007
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=dd92aad33c33c283921f1dcec391fb248ee5c902;p=tmp%2Fjakarta-migration.git

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

dd92aad33c33c283921f1dcec391fb248ee5c902