From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 13 Jun 2012 22:43:30 +0000 (-0700)
Subject: Merge branch 'master' into CSPACE-5129
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7e981606a974390f053ccea6ed3810cab688efa2;p=tmp%2Fjakarta-migration.git

Merge branch 'master' into CSPACE-5129
---

7e981606a974390f053ccea6ed3810cab688efa2