This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.
Merged fix to suppress gcc3.4 warnings in make_void from main trunk to branch