From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 7 Dec 2012 02:39:40 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5727
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=725929cc355b9ffc2c4d63cc8414e33837674b3a;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into CSPACE-5727
---

725929cc355b9ffc2c4d63cc8414e33837674b3a