merge Luke's branch with the trunk


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