From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 28 Jun 2013 22:04:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6001
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7266edfd8c34673f5c2c94aa7c16b9827e3b4204;p=tmp%2Fjakarta-migration.git

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

7266edfd8c34673f5c2c94aa7c16b9827e3b4204