From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 1 Apr 2011 09:25:48 +0000 (+0200)
Subject: merge my and Abranches' branches
X-Git-Tag: 2.00~1195^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecb2a8b6567dd8f1263e5308b32596b35186df53;p=thirdparty%2Fgrub.git

merge my and Abranches' branches
---

ecb2a8b6567dd8f1263e5308b32596b35186df53