测试冲突

测试冲突
xxx
ss
Merge pull request #1 from xiajunsongfan/master

s
Merge pull request #3 from xiajun868/20130619

RR
Merge pull request #4 from xiajun868/master

tty