第2次commit 1303191514
Merge branch 'master' of https://github.com/lyonte/GitTest20130318.git into newbranch