From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 17 May 2012 06:21:52 +0000 (-0700)
Subject: Merge branch 'CSPACE-5133-A'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=24593ce8db593bf729d774e16351144b5132558e;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5133-A'
---

24593ce8db593bf729d774e16351144b5132558e