Merge branch-2-1

author Frank Lahm <franklahm@googlemail.com>

Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)

committer Frank Lahm <franklahm@googlemail.com>

Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)
author Frank Lahm <franklahm@googlemail.com>
Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)
committer Frank Lahm <franklahm@googlemail.com>
Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)
diff --cc NEWS
Simple merge
diff --cc etc/cnid_dbd/cnid_metad.c
Simple merge
author	Frank Lahm <franklahm@googlemail.com>
	Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)
committer	Frank Lahm <franklahm@googlemail.com>
	Wed, 17 Nov 2010 10:18:11 +0000 (11:18 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
etc/cnid_dbd/cnid_metad.c	patch \|	diff1 \|	diff2 \|	blob \| history