Merge branch 'master' into roland/bug-compat
authorRoland McGrath <roland@redhat.com>
Thu, 18 Dec 2008 23:47:01 +0000 (15:47 -0800)
committerRoland McGrath <roland@redhat.com>
Thu, 18 Dec 2008 23:47:01 +0000 (15:47 -0800)
commit468b3739cde6cb3a8727eb8eff8cd2686e734e77
treeecc3d4b23cd49cfddf2ec9fa007cd257ec222800
parent43166e0f17ee95874e3a767bee971cce788a3e98
parent7d9b821db6bc494417a57321b419c6b9481a2128
Merge branch 'master' into roland/bug-compat

Conflicts:
libdwfl/ChangeLog
libdwfl/ChangeLog