saberma/19wu — pull request #175 by doitian (2013-01-06 04:24:34+00:00)
Title: Minor merging issues

冲突部分的代码