From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Mon, 23 Jul 2012 23:27:42 +0000 (-0700)
Subject: Merge branch 'CSPACE-5381'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8f3b04f1ebc3d7fd002dafd8fed1fa32343985d4;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5381'
---

8f3b04f1ebc3d7fd002dafd8fed1fa32343985d4