From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 7 Dec 2012 03:45:39 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5727
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f1b9b889bfab354f0a6bc7ea414e9ea867db1a79;p=tmp%2Fjakarta-migration.git

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

f1b9b889bfab354f0a6bc7ea414e9ea867db1a79