merge mainline into net
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 5 Jul 2011 23:35:41 +0000 (01:35 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 5 Jul 2011 23:35:41 +0000 (01:35 +0200)
1  2 
grub-core/Makefile.am
grub-core/Makefile.core.def
util/grub-mkimage.c

Simple merge
Simple merge
Simple merge