Merge branch 'bugzilla-14782' into release

This commit is contained in:
Len Brown 2009-12-16 02:19:55 -05:00
commit 8033c314b9