For the following conflicts, I accepted the branch revision of the file: * .odt openoffice files (the docs). * jbossesb-server-base.zip If people are aware of situations where this was the wrong thing to do, can they please let me know and I'll rectify it. I think there may still be some configeditor merges required. I got a bit confused by this stuff and I'm not sure I merged it properly. Also, I'd appreciate if people could (at some stage) run a quick check over components that they know are not covered by any automated tests. Regards, T. -- Red Hat: Registered Address: Red Hat Ltd, Brian O' Donnell and Partners, 62 Merrion Square, Dublin 2, Ireland. Registered in the Companies Registration Office, Parnell House, 14 Parnell Square, Dublin 1, Ireland, at No. 304873 Directors: Charlie Peters (USA), Michael Cunningham (USA). David Owens, Brendan Lane