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

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

dfe88011a0c4dcbd1d50667f6386b3e21840788f