Pull bugzilla-8630 into release branch

This commit is contained in:
Len Brown 2007-08-24 22:19:20 -04:00
commit de9bde9adb