fixing compiler warnings
Merge branch 'master' of hgwdev.cse.ucsc.edu:/data/git/kent
Merge remote-tracking branch: upstream/master