From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 17 May 2012 16:59:53 +0000 (-0700)
Subject: Merge branch 'CSPACE-4084'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=2a4fb8d77152664690b8a6b6c98bcbe4c3cf802a;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-4084'
---

2a4fb8d77152664690b8a6b6c98bcbe4c3cf802a