baixing/haojing — pull request #42 by icedfish (2012-09-18 10:28:54+00:00)
Title: 测试fork出来解决冲突再提交是否能直接auto merge

之前的pull reqeust #33先直接关掉了
fixed #37