Merge pull request #2 from xiajunsongfan/20130619

提取
Merge pull request #3 from xiajun868/20130619

RR