From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 30 Dec 2009 13:08:10 +0000 (+0100)
Subject: Merge mainline into asprintf
X-Git-Tag: 1.98~151^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acea847040f469e0ee1c7dfbeacd5fe72748f8cf;p=thirdparty%2Fgrub.git

Merge mainline into asprintf
---

acea847040f469e0ee1c7dfbeacd5fe72748f8cf