Pull bugzilla-7880 into release branch

This commit is contained in:
Len Brown 2007-07-22 02:25:03 -04:00
commit 22aadf8a07