Pull bugzilla-8346 into release branch

This commit is contained in:
Len Brown 2007-04-28 23:19:25 -04:00
commit aac60c1113