[cango] 20130313
[cango] fix merge issue