* Fix hang in previous patch.
Merge remote-tracking branch 'cvs/branch-2_6' into branch-2_6