From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 3 Aug 2012 20:45:51 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5271
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=176f12f7ae8056fc3d98554754803b6a4bc27abe;p=tmp%2Fjakarta-migration.git

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

176f12f7ae8056fc3d98554754803b6a4bc27abe