xiezhifeng/Test — pull request #5 by xiezhifeng (2012-11-27 06:08:01+00:00)
Title: Local merge

Please merge my change