From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 24 Jul 2012 03:30:56 +0000 (-0700)
Subject: Merge branch 'v2.5'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7a559beb713d1c5e484e23c6722a9c71d99bb25c;p=tmp%2Fjakarta-migration.git

Merge branch 'v2.5'
---

7a559beb713d1c5e484e23c6722a9c71d99bb25c