Merged from mwolson@gnu.org--2005 (patch 242-246, 249, 251-252, 255-257)