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

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

a83302794222143a13b6caf2e538aab11992386b