From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 10 Jul 2012 17:53:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5359
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8708bfa0d2677eb3c69be09189686d7bd4fdddf8;p=tmp%2Fjakarta-migration.git

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

8708bfa0d2677eb3c69be09189686d7bd4fdddf8