From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 30 Nov 2012 22:47:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5498
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5e92216fb4938a92ffc5b55627618106bb490e60;p=tmp%2Fjakarta-migration.git

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

5e92216fb4938a92ffc5b55627618106bb490e60