From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 20 Apr 2012 19:29:50 +0000 (-0700)
Subject: Merge branch 'CSPACE-5025'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d11ed7e2305100faed21701de4533d9d3396c37f;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5025'
---

d11ed7e2305100faed21701de4533d9d3396c37f