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

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

400238bf5bfcaa48e177f0284dc65ce20fa0e5e4