Pull bugzilla-8709 into release branch

This commit is contained in:
Len Brown 2007-10-10 00:30:55 -04:00
commit 731aa5fd99