merge my and Abranches' branches
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 1 Apr 2011 09:25:48 +0000 (11:25 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 1 Apr 2011 09:25:48 +0000 (11:25 +0200)
1  2 
grub-core/net/net.c

Simple merge