From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 17 May 2012 21:27:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3f570a664ffbfe92ba9afecc4d808db11515d602;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'remotes/upstream/master'
---

3f570a664ffbfe92ba9afecc4d808db11515d602