From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 17 Feb 2010 23:48:02 +0000 (+0100)
Subject: criss-cross merge with my sid branch
X-Git-Tag: 0.8.0~9^2~64^2~20^2~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fc04d4b48a0a464a9fc3570e674c17ad81c3134d

criss-cross merge with my sid branch
---

fc04d4b48a0a464a9fc3570e674c17ad81c3134d