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

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

da1251d23dd6824d5bdc9fff31811cdde2b23f9a