From: Petr Machata <pmachata@redhat.com>
Date: Tue, 5 May 2009 14:40:09 +0000 (+0200)
Subject: Merge commit 'origin/master' into pmachata/pending
X-Git-Tag: elfutils-0.142~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2312613319efc397d2dc2285e84268b7b54dbb5;p=thirdparty%2Felfutils.git

Merge commit 'origin/master' into pmachata/pending

Conflicts:
	libdw/dwarf_error.c
---

e2312613319efc397d2dc2285e84268b7b54dbb5