From: Rick Jaffe Date: Fri, 20 Jul 2012 01:24:55 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/v2.5' into CSPACE-5405 X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=1c02a2e898c66a9a841b86ac8cb04bcb199c2a7c;p=tmp%2Fjakarta-migration.git Merge remote-tracking branch 'upstream/v2.5' into CSPACE-5405 --- 1c02a2e898c66a9a841b86ac8cb04bcb199c2a7c