From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 22 Aug 2012 00:16:44 +0000 (-0700)
Subject: Merge branch 'v2.6'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=db5dc765ecbb704057afdb52773334699cd0533c;p=tmp%2Fjakarta-migration.git

Merge branch 'v2.6'
---

db5dc765ecbb704057afdb52773334699cd0533c