Merge branch 'master' into pr-msvc-support

author Peter Rosin <peda@lysator.liu.se>

Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)

committer Peter Rosin <peda@lysator.liu.se>

Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)
author Peter Rosin <peda@lysator.liu.se>
Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)
committer Peter Rosin <peda@lysator.liu.se>
Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)
diff --cc ChangeLog
Simple merge
diff --cc libltdl/m4/libtool.m4
Simple merge
author	Peter Rosin <peda@lysator.liu.se>
	Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)
committer	Peter Rosin <peda@lysator.liu.se>
	Sat, 21 Mar 2009 19:09:02 +0000 (20:09 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
libltdl/m4/libtool.m4	patch \|	diff1 \|	diff2 \|	blob \| history