Merge pull request #1 from apache/trunk

merge