From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 9 Apr 2012 18:11:02 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into cspace-4814
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e85fe90a94b2225a30e0bcc85bae97b78c94d12c;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into cspace-4814
---

e85fe90a94b2225a30e0bcc85bae97b78c94d12c