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

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

1b21fc528273a6cef745209d9eb76df805c66ab3