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

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

af66d6c98378d215b620d92ce2770daeee91e05c