From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 16 Jan 2013 23:29:21 +0000 (-0800)
Subject: Merge branch 'CSPACE-5305'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ff20b54c2fec04c0b727638098630607ff01aed7;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5305'
---

ff20b54c2fec04c0b727638098630607ff01aed7