This contains the accepted patches from mailing list. Some bug fixes, 
and version string changes.  Please give it a test.

-- 
Thank you,
<Alexandra>