Rainer Gerhards ae7a01e137 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-03-11 15:15:34 +01:00
..
2009-03-11 15:15:34 +01:00