From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Dec 2010 23:40:20 +0000 (+0100)
Subject: merge mainline into ZFS
X-Git-Tag: 2.00~1054^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78ab87f61dfa511ea41046637a332dcc98e76b9e;p=thirdparty%2Fgrub.git

merge mainline into ZFS
---

78ab87f61dfa511ea41046637a332dcc98e76b9e