merge mainline into nested

author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)

committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)
diff --cc Makefile.util.def
Simple merge
diff --cc grub-core/normal/completion.c
Simple merge
diff --cc util/grub-install.in
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Wed, 8 Sep 2010 18:40:27 +0000 (20:40 +0200)
		1	2
Makefile.util.def	patch \|	diff1 \|	diff2 \|	blob \| history
grub-core/normal/completion.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/grub-install.in	patch \|	diff1 \|	diff2 \|	blob \| history