From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Mon, 2 Apr 2012 23:09:26 +0000 (-0700)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7428f7c5ceea642cc90c7ab1e53696dcf0fb9d56;p=tmp%2Fjakarta-migration.git

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

7428f7c5ceea642cc90c7ab1e53696dcf0fb9d56