canon-host: Include netdb.h instead of getaddrinfo.h.
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.