From: Adam Glasgall <glasgall@mit.edu>
Date: Mon, 9 Jun 2014 04:57:01 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/pvgrub.git/commitdiff_plain/a5b904bacdde606722a6679c94fe35d974507111

Merge branch 'upstream'
---

a5b904bacdde606722a6679c94fe35d974507111