Tom Fennelly
committed
on 29 Mar 07
Merged 4.2 MR1 branch changes into trunk.
NOTE: In the case of conflicts on the .odt docs (openoffice) I just accepted the branch version of… Show more
Merged 4.2 MR1 branch changes into trunk.

NOTE: In the case of conflicts on the .odt docs (openoffice) I just accepted the branch version of these files based on the assumption that these are the most up-to-date. Show less