Merge sf/master

author Frank Lahm <franklahm@googlemail.com>

Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)

committer Frank Lahm <franklahm@googlemail.com>

Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)
author Frank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)
committer Frank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)
diff --cc NEWS
Simple merge
diff --cc configure.in
Simple merge
author	Frank Lahm <franklahm@googlemail.com>
	Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)
committer	Frank Lahm <franklahm@googlemail.com>
	Mon, 6 Jun 2011 07:40:59 +0000 (09:40 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history