Pull bugzilla-7122 into release branch

This commit is contained in:
Len Brown 2007-02-16 22:11:31 -05:00
commit 1004879f25