2002-09-05  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpdrawable-bucket-fill.c: put the call to
	gimp_drawable_mask_bounds() back because we always need the region
	to apply the fill (fixes non-seed-fill fills). Also take
	"sample_merged" into account when intersecting the resulting mask
	with the image's selection.

	Fixed unrelated bug:

	* app/core/gimpimage-contiguous-region.c: need to use
	gimp_image_projection_bytes(), not drawable->bytes if
	"sample_marged" is TRUE.