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

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

e7ad7b16dd13509b2b810a881f76a1e2e15d4748