From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 14 Dec 2012 23:54:00 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5727
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bfe32dc25fcffbaa69f57e41978c42e7306d5721;p=tmp%2Fjakarta-migration.git

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

bfe32dc25fcffbaa69f57e41978c42e7306d5721