From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 28 Nov 2012 20:26:08 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-5498
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7468053949f1d1459c86ed21815af9eac7224415;p=tmp%2Fjakarta-migration.git

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

7468053949f1d1459c86ed21815af9eac7224415