Merge remote branch 'origin/product-2-2' into develop

author Frank Lahm <franklahm@googlemail.com>

Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)

committer Frank Lahm <franklahm@googlemail.com>

Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)
author Frank Lahm <franklahm@googlemail.com>
Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)
committer Frank Lahm <franklahm@googlemail.com>
Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)
diff --cc NEWS
Simple merge
diff --cc etc/cnid_dbd/dbif.c
Simple merge
author	Frank Lahm <franklahm@googlemail.com>
	Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)
committer	Frank Lahm <franklahm@googlemail.com>
	Fri, 30 Mar 2012 08:48:10 +0000 (10:48 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
etc/cnid_dbd/dbif.c	patch \|	diff1 \|	diff2 \|	blob \| history