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

No match.