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

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

eca610eefb49f1dc6617586fcea7afab3700b684