resolve conflicts.
Help stupid cvs fixing basic conflicts.
Merge to Cygnus 961112 + add some support (not ready) for shared libs