diff -u libxcb-1.1/debian/patches/series libxcb-1.1/debian/patches/series
--- libxcb-1.1/debian/patches/series
+++ libxcb-1.1/debian/patches/series
@@ -1,0 +2 @@
+101_fix_lp277069.diff
diff -u libxcb-1.1/debian/changelog libxcb-1.1/debian/changelog
--- libxcb-1.1/debian/changelog
+++ libxcb-1.1/debian/changelog
@@ -1,3 +1,9 @@
+libxcb (1.1-1ubuntu2) hardy-proposed; urgency=low
+
+  * Disable Nagle on TCP socket (LP: #277069)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 27 May 2009 01:10:41 +0200
+
 libxcb (1.1-1ubuntu1) hardy; urgency=low
 
   * Add 100_sloppy_lock.diff, which reverses the locking logic, ie. sloppy
only in patch2:
unchanged:
--- libxcb-1.1.orig/debian/patches/101_fix_lp277069.diff
+++ libxcb-1.1/debian/patches/101_fix_lp277069.diff
@@ -0,0 +1,26 @@
+Index: libxcb-1.1/src/xcb_util.c
+--- libxcb-1.1.orig/src/xcb_util.c 2009-05-26 12:36:47.000000000 +0200
++++ libxcb-1.1/src/xcb_util.c  2009-05-26 12:38:59.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <netinet/in.h>
++#include <netinet/tcp.h>
+ #ifdef DNETCONN
+ #include <netdnet/dnetdb.h>
+ #include <netdnet/dn.h>
+@@ -233,8 +234,12 @@
+     for(addr = results; addr; addr = addr->ai_next)
+     {
+         fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+-        if(fd >= 0 && connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
++        if(fd >= 0) {
++    int on = 1;
++    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
++    if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
+             break;
++  }
+         fd = -1;
+     }
+     freeaddrinfo(results);
+