[daisy] Ahead warning: merging BRANCH_DOCID into trunk

[Bruno Dumon]

Hi,

Since the most critical changes on BRANCH_DOCID are done and everything
compiles and runs again (as far as tested), I'm going to merge the
branch back to trunk so that development can continue there, without
having to care about the branch anymore.

People looking for a more stable branch can use BRANCH_1_5_X.

-- 
Bruno Dumon                             http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
bruno at outerthought.org                          bruno at apache.org