Pull bugzilla-8066 into release branch

This commit is contained in:
Len Brown 2007-03-09 23:19:19 -05:00
commit bdf3aaf951