- fix conflict with gnulib
- rel 2