Including security fixes for CVE-2008-1447 and CVE-2007-1558. Tested by Jeremy Evans, jcs@, sturm@ and msf@. Thank you!