From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 16 May 2013 00:51:57 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6001
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bdab439b61ec53ee23ca26c4b9364a51c904bd6b;p=tmp%2Fjakarta-migration.git

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

bdab439b61ec53ee23ca26c4b9364a51c904bd6b