jimbo_zhang 6938be5040 resolve merge 5 gadi atpakaļ
..
goahead.h 6938be5040 resolve merge 5 gadi atpakaļ