From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 13:33:01 +0000 (+0100)
Subject: merge
X-Git-Tag: 1.98~93^2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c33d7d1ffd75f9f70503c6b48dc4afbf2d5bf9;p=thirdparty%2Fgrub.git

merge
---

c8c33d7d1ffd75f9f70503c6b48dc4afbf2d5bf9