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

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

0d8c5aa638e53c09f5e7ae5f6d5d0cddcc1807c8