pgbouncer - pgbouncer: merge fixes from HEAD

Log Message:
-----------
merge fixes from HEAD

Tags:
----
pgbouncer_1_1_stable

Modified Files:
--------------
    pgbouncer/src:
        proto.c (r1.10 -> r1.10.2.1)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbouncer/pgbouncer/src/proto.c.diff?r1=1.10&r2=1.10.2.1)
        proto.h (r1.3 -> r1.3.2.1)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbouncer/pgbouncer/src/proto.h.diff?r1=1.3&r2=1.3.2.1)
        server.c (r1.18 -> r1.18.2.1)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbouncer/pgbouncer/src/server.c.diff?r1=1.18&r2=1.18.2.1)
        varcache.c (r1.5 -> r1.5.2.1)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbouncer/pgbouncer/src/varcache.c.diff?r1=1.5&r2=1.5.2.1)