Avoid assigning ARPA_INET_H in different .m4 files.
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.