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

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

1849db28057df23bb640efc41654e4cf7f787751