Pull bugzilla-9262 into release branch

This commit is contained in:
Len Brown 2007-11-20 01:18:07 -05:00
commit 5824b45126