From: Tim Kientzle <kientzle@acm.org>
Date: Mon, 26 Mar 2012 04:03:35 +0000 (-0700)
Subject: Merge master into release.
X-Git-Tag: v3.0.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d065c0b19c94e89a4ab0b2d779c41c4fda7b7b68;p=thirdparty%2Flibarchive.git

Merge master into release.
---

d065c0b19c94e89a4ab0b2d779c41c4fda7b7b68