Merge pull request #2 from apache/master

Merge from trunk to caofangkun