]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge trunk
authorFelix Zielcke <fzielcke@z-51.de>
Fri, 13 Nov 2009 13:15:36 +0000 (14:15 +0100)
committerFelix Zielcke <fzielcke@z-51.de>
Fri, 13 Nov 2009 13:15:36 +0000 (14:15 +0100)
1  2 
conf/common.rmk

diff --cc conf/common.rmk
Simple merge