Merge mainstream into mips

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

Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)

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

Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)
diff --cc Makefile.in
Simple merge
diff --cc util/grub-mkrawimage.c
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Mon, 23 Nov 2009 10:07:31 +0000 (11:07 +0100)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
util/grub-mkrawimage.c	patch \|	diff1 \|	diff2 \|	blob \| history