Merge remote-tracking branch 'origin/released'

Conflicts:
	libxcb/src/xcb_in.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 1 insertions, 1 deletions

diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c
index e0e7a7cac..ccfb3e0f4 100644
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
@@ -541,7 +541,7 @@ static xcb_generic_event_t *poll_for_next_event(xcb_connection_t *c, int queued)
         pthread_mutex_lock(&c->iolock);

         /* FIXME: follow X meets Z architecture changes. */

         ret = get_event(c);

-        if(!ret && !queued && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */

+        if(!ret && !queued && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */

             ret = get_event(c);

         pthread_mutex_unlock(&c->iolock);

     }