merge of 'c249e2584bf9a7142285afa71425029b4278e771'
authorUlrich Drepper <drepper@redhat.com>
Tue, 30 Jan 2007 16:19:09 +0000 (16:19 +0000)
committerUlrich Drepper <drepper@redhat.com>
Tue, 30 Jan 2007 16:19:09 +0000 (16:19 +0000)
commitecf2b124a22590ac47688a6e8c2ff8865d23f774
treef42d0e9c32ef56ea382e76767cf9f47c9744a76f
parentd39384c10b8cba1e1d583e65743a653ee6224320
Merge ... 'c249e2584bf9a7142285afa71425029b4278e771'
     and 'f6e8ba00784e83d73dc2183c444f6595474796e4'
libelf/ChangeLog
libelf/nlist.c