of the code. Even though we don't want to scale the two
	dimensions separately at the moment, I figured it was better
	to go in this direction than to remove all the separate X
	and Y stuff that Seth Nickell added.

	* libnautilus/gnome-icon-container-dnd.c
	(gnome_icon_container_receive_dropped_icons):
	* libnautilus/gnome-icon-container-private.h:
	* libnautilus/gnome-icon-container.c (icon_get_actual_size),
	(icon_new), (icon_get_size), (start_stretching), (update_icon),
	(gnome_icon_container_add), (gnome_icon_container_is_stretched),
	(gnome_icon_container_unstretch),
	(gnome_icon_container_move_icon):
	* libnautilus/gnome-icon-container.h:
	Got rid of the old "scale", "xscale", and "yscale" and replaced
	them with "scale_x" and "scale_y". Made the code always set the
	scale factor through the gnome_icon_container_move_icon bottleneck
	so the changes are all reported throught the icon_moved signal.

	* src/file-manager/fm-directory-view-icons.c:
	(add_icon_if_already_positioned),
	(fm_directory_view_icons_icon_moved_cb):
	Store only a single scale factor if the X and Y are both scaled
	exactly the same (the normal case). Also, use a default for
	the scale factor so we don't save 1.0 for every file.

	* libnautilus/nautilus-gtk-extensions.h:
	* libnautilus/nautilus-gtk-extensions.c:
	My original change required an additional marshal function. I
	decided to add it anyway even though I don't need it right now.

	* libnautilus/nautilus/nautilus-bookmark.c
	(nautilus_bookmark_get_pixmap_and_mask):
	Changed to use the nautilus_icon_factory_get_pixbuf_for_file
	convenience function which has a simpler interface.

	* libnautilus/nautilus-icon-factory.h:
	* libnautilus/nautilus-icon-factory.c:
	Added separate X and Y scaling of icons for possible future
	use; the convenience functions still use the same size in
	both dimentions.

	* components/music/.cvsignore:
	  New directory, new .cvsignore needed.

	* RENAMING: Some more name change ideas.