Merge branch 'bugzilla-10695' into release

This commit is contained in:
Len Brown 2008-06-20 02:45:05 -04:00
commit 7b09f27891