Merge branch 'master' into pr-msvc-support

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

Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)

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

Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)
author Peter Rosin <peda@lysator.liu.se>
Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)
committer Peter Rosin <peda@lysator.liu.se>
Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)
diff --cc ChangeLog
Simple merge
diff --cc libltdl/m4/libtool.m4
Simple merge
author	Peter Rosin <peda@lysator.liu.se>
	Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)
committer	Peter Rosin <peda@lysator.liu.se>
	Fri, 11 Sep 2009 04:40:30 +0000 (06:40 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
libltdl/m4/libtool.m4	patch \|	diff1 \|	diff2 \|	blob \| history