Solved cvs conflict
[gnupg.git] / m4 /
2003-10-25 Werner KochNew.