Pull bugzilla-6859 into release branch

This commit is contained in:
Len Brown 2007-03-09 23:18:35 -05:00
commit 3dfb737998