resolve conflicts

import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@

merge openssl 0.9.6b-engine

Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries