Pull bugzilla-8768 into release branch

This commit is contained in:
Len Brown 2007-08-12 00:18:11 -04:00
commit fc0dc4d3aa