From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 8 Feb 2013 22:45:18 +0000 (-0800)
Subject: Merge branch 'CSPACE-5870'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d93520f78963fd233d927c42152272915165aefd;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5870'
---

d93520f78963fd233d927c42152272915165aefd