Hi James,

The branch "source-directory-reorg" is ready to go, I did a local merge
from the branch to trunk and verified that the tests pass (both in Eclipse,
and by running "mvn test").

However, I just tried merging to trunk, but I think there is a permissions
issue preventing me from modifying trunk. If that's correct, can you grant
me the necessary permissions? Or do you want to handle the merge yourself?

Thanks!

Will