Merge branch 'bugzilla-13671' into release

This commit is contained in:
Len Brown 2009-12-30 02:51:31 -05:00
commit b943aa83f8