Merge branch 'maint'

author Andre Noll <maan@systemlinux.org>

Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)

committer Andre Noll <maan@systemlinux.org>

Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
author Andre Noll <maan@systemlinux.org>
Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
committer Andre Noll <maan@systemlinux.org>
Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
diff --cc daemon.c
Simple merge
diff --cc user_list.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
		1	2
daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
user_list.c	patch \|	diff1 \|	diff2 \|	blob \| history