Merge commit 'fml/master'

author Andre Noll <maan@systemlinux.org>

Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)

committer Andre Noll <maan@systemlinux.org>

Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
author Andre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
committer Andre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
diff --cc interactive.c
Simple merge
diff --cc user.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
		1	2
interactive.c	patch \|	diff1 \|	diff2 \|	blob \| history
user.c	patch \|	diff1 \|	diff2 \|	blob \| history