This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.

[SVN r17693]
This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.

[SVN r19146]
merged from trunk


[SVN r19631]