Merge remote-tracking branch 'origin/released'

* origin/released:
  pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013

Conflicts:
	fontconfig/src/fcatomic.c
	pixman/pixman/pixman-mmx.c
	pixman/pixman/pixman-sse2.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/xfixes/cursor.c

1 files changed, 1 insertions, 1 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 283070046..b06017dd8 100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -2500,7 +2500,7 @@ ProcListInstalledColormaps(ClientPtr client)
     preply->type = X_Reply;

     preply->sequenceNumber = client->sequence;

     nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps)

-        (pWin->drawable.pScreen, (Colormap *) & preply[1]);

+        (pWin->drawable.pScreen, (Colormap *) &preply[1]);

     preply->nColormaps = nummaps;

     preply->length = nummaps;

     WriteReplyToClient(client, sizeof(xListInstalledColormapsReply), preply);