Merge from 2-1

author Frank Lahm <franklahm@googlemail.com>

Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)

committer Frank Lahm <franklahm@googlemail.com>

Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)
author Frank Lahm <franklahm@googlemail.com>
Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)
committer Frank Lahm <franklahm@googlemail.com>
Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)
diff --cc NEWS
Simple merge
diff --cc configure.in
Simple merge
author	Frank Lahm <franklahm@googlemail.com>
	Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)
committer	Frank Lahm <franklahm@googlemail.com>
	Sun, 16 Jan 2011 08:36:31 +0000 (09:36 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history