Merge branch 'master' into nohook

author Pierre Habouzit <madcoder@debian.org>

Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)

committer Pierre Habouzit <madcoder@debian.org>

Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)
author Pierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)
committer Pierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)
diff --cc crypt.cpkg
Simple merge
diff --cc lib-mx/compress.c
Simple merge
diff --cc lib-mx/mx.c
Simple merge
author	Pierre Habouzit <madcoder@debian.org>
	Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)
committer	Pierre Habouzit <madcoder@debian.org>
	Tue, 20 Nov 2007 21:34:21 +0000 (22:34 +0100)
		1	2
crypt.cpkg	patch \|	diff1 \|	diff2 \|	blob \| history
lib-mx/compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib-mx/mx.c	patch \|	diff1 \|	diff2 \|	blob \| history