Pull bugzilla-9327 into release branch

This commit is contained in:
Len Brown 2007-11-20 01:18:19 -05:00
commit 22201f7402