linqing commit test1
Merge pull request #1 from QingLin2013/master

linqing commit test1