Fix warnings.
Merge branch 'origin' of ../cvs/src