From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 6 Sep 2012 23:49:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5518
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b4f68420a7b11663b915689a8fcdd0af7c6f6a26;p=tmp%2Fjakarta-migration.git

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

b4f68420a7b11663b915689a8fcdd0af7c6f6a26