Pull bugzilla-9747 into release branch

This commit is contained in:
Len Brown 2008-01-23 23:48:19 -05:00
commit 7456337d1f