From: Eli Bendersky <eliben@gmail.com>
Date: Wed, 16 Nov 2011 05:39:45 +0000 (+0200)
Subject: merge & resolve conflicts from remote
X-Git-Tag: v0.10~77
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96473695494ea8679e2317b9cd949b056aa1464f;p=pyelftools.git

merge & resolve conflicts from remote
---

96473695494ea8679e2317b9cd949b056aa1464f