From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 23 Apr 2013 20:48:46 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5978
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e787b60a129db54c240e49b7a09a2a0e3a5d3c92;p=tmp%2Fjakarta-migration.git

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

e787b60a129db54c240e49b7a09a2a0e3a5d3c92