From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 2 Mar 2013 00:38:11 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5907
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d6e2c175151bef73b13640921516f0881665a31e;p=tmp%2Fjakarta-migration.git

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

d6e2c175151bef73b13640921516f0881665a31e