[Bug XXXX] Bug Description
Cause: None
Solution: None
Fixed Version: 201405041117
Branch: None
Merge branch 'master' of https://github.com/huangjingpei/myrepos into mytest

Conflicts:
	mytest.c
[Bug XXXX] Bug Description
Cause: None
Solution: None
Fixed Version: add second.c

Branch: None
Merge branch 'master' of https://github.com/huangjingpei/myrepos into mytest