From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 8 Aug 2012 17:58:33 +0000 (-0700)
Subject: Merge branch 'CSPACE-5437'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f07b87f6e492e1b289720a09d71545b1516947b3;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5437'
---

f07b87f6e492e1b289720a09d71545b1516947b3