Pull bugzilla-8171 into release branch

This commit is contained in:
Len Brown 2008-01-11 12:22:57 -05:00
commit aa7f00741d