From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 22 Aug 2013 21:59:10 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6130
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e2f361174b91cda2704af2a0602ac069ceae9f2a;p=tmp%2Fjakarta-migration.git

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

e2f361174b91cda2704af2a0602ac069ceae9f2a