Merge branch 'from-mac/00-26-b9-7a-83-c5-baohaojun-Linux' of https://github.com/baohaojun/baohaojun.github.com
Merge remote-tracking branch 'origin/master'