a commit on the trunk branch
Merge pull request #1 from weaties/trunk

a commit on the trunk branch