tree e57905c049082115e4c1c575ed9248b694211768
parent 1a4b6e3f337bd13d63a619911118a57948ba6deb
author Maria Odea B. Ching <oching@apache.org> 1274265507 +0000
committer Maria Odea B. Ching <oching@apache.org> 1274265507 +0000

merge -r946052 from trunk


git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-flat-multi-module-updated@946111 13f79535-47bb-0310-9956-ffa450edef68