Pull bugzilla-6316 into release branch

This commit is contained in:
Len Brown 2007-03-09 23:18:22 -05:00
commit 63be2d9305