2011-03-14  Colin Watson  <cjwatson@ubuntu.com>

	* grub-core/partmap/msdos.c (embed_signatures): New array.
	(pc_partition_map_embed): Check for and avoid sectors matching any
	of the signatures in embed_signatures.
	* util/grub-setup.c (setup): Allow for the embedding area being
	split into multiple blocklists.