From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 10 Mar 2008 17:00:44 +0000 (+0100)
Subject: Merge commit 'err.no/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=dpkg

Merge commit 'err.no/master'

Conflicts:

	src/archives.c
---

690e02ad66a9388303e889b2663b419172e250c4