20130619
Merge branch 'master' of https://github.com/hanyong123/my-autotest