fix build problems on some platforms (namely RHEL/CENTOS 5)
Merge remote-tracking branch 'github/master'

Conflicts:
	ChangeLog
	configure.ac