Merge commit 'meins/master'

author Andre Noll <maan@systemlinux.org>

Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)

committer Andre Noll <maan@systemlinux.org>

Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
author Andre Noll <maan@systemlinux.org>
Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
committer Andre Noll <maan@systemlinux.org>
Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
diff --cc fd.c
Simple merge
diff --cc string.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
		1	2
fd.c	patch \|	diff1 \|	diff2 \|	blob \| history
string.c	patch \|	diff1 \|	diff2 \|	blob \| history