Merge branch 'bugzilla-15064' into release

This commit is contained in:
Len Brown 2010-01-20 01:15:21 -05:00
commit 361243fd62