From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 17 May 2012 19:06:06 +0000 (-0700)
Subject: Merge pull request #25 from amywieliczka/CSPACE-5128
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=2304e67b121a81a63fed88a7807b9b69650fc212;p=tmp%2Fjakarta-migration.git

Merge pull request #25 from amywieliczka/CSPACE-5128

CSPACE-5128
---

2304e67b121a81a63fed88a7807b9b69650fc212