Merge branch 't/clang_analyzer_fixes'

author Andre Noll <maan@systemlinux.org>

Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)

committer Andre Noll <maan@systemlinux.org>

Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)
author Andre Noll <maan@systemlinux.org>
Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)
committer Andre Noll <maan@systemlinux.org>
Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)
diff --cc command.c
Simple merge
diff --cc crypt.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 15 Oct 2011 13:36:38 +0000 (15:36 +0200)
		1	2
command.c	patch \|	diff1 \|	diff2 \|	blob \| history
crypt.c	patch \|	diff1 \|	diff2 \|	blob \| history