From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 07:06:28 +0000 (+0100)
Subject: merge mainline into asprintf
X-Git-Tag: 1.98~151^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14284856a2ea30fca6911da69548bff5e4d65fd8;p=thirdparty%2Fgrub.git

merge mainline into asprintf
---

14284856a2ea30fca6911da69548bff5e4d65fd8