Merged from mwolson@gnu.org--2006 (patch 10-13)