Pull bugzilla-7200 into release branch

This commit is contained in:
Len Brown 2007-02-16 22:11:37 -05:00
commit 4559b43822