From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 26 Aug 2013 19:08:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6130
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0288a785a5c167255861831d3adb2af62d545e10;p=tmp%2Fjakarta-migration.git

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

0288a785a5c167255861831d3adb2af62d545e10