Merge branch 'bugzilla-14379' into release

This commit is contained in:
Len Brown 2009-11-25 00:04:48 -05:00
commit a4257763de