Merged from 1.33.0 release

[SVN r30540]
This commit is contained in:
Douglas Gregor
2005-08-12 13:02:37 +00:00
parent 924368a775
commit 45949a9316