From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 8 Aug 2012 01:03:11 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-4691
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9d2377c94856607da086714b9e80a90379149deb;p=tmp%2Fjakarta-migration.git

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

9d2377c94856607da086714b9e80a90379149deb