Sync with davidsmith@acm.org--2005 (patch 0), davidsmith@acm.org--main (patch 0-2...