Resolve conflicts.
authorjbj <devnull@localhost>
Thu, 7 Nov 2002 13:18:27 +0000 (13:18 +0000)
committerjbj <devnull@localhost>
Thu, 7 Nov 2002 13:18:27 +0000 (13:18 +0000)
commit9f5183ea6490c7859ecfb281af1097adad43fb48
tree5b6f38ec85a8769b40b115a54492a7c9f5c5921b
parentd9fb627db673d01a4e3a483730fa60085df0c1d7
Resolve conflicts.

CVS patchset: 5836
CVS date: 2002/11/07 13:18:27
elfutils/configure.ac