htdbm proposal - add jorton's trunk fix for x86_64 compiler warning,

and update combined 2.2.x patch again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@814804 13f79535-47bb-0310-9956-ffa450edef68