SF #1149508: ensure textwrap handles hyphenated numbers correctly,

eg. "2004-03-04" is not broken across lines.  (Merged from 2.4 branch.)