another merge to make svn happy


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/trunk-staging@1351919 13f79535-47bb-0310-9956-ffa450edef68
tree: e9e6de385e9b3d11d63ef81bb295b349f8eba988
  1. doc/
  2. etc/
  3. src/
  4. DISCLAIMER
  5. INSTALL
  6. LICENSE
  7. Makefile
  8. NOTICE
  9. README