xserver: Branch 'master'

[Søren Sandmann Pedersen]

 fb/fbmmx.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 6c4f1826bf2c5f30f5fe6e489a02b6375478b380 (from ae04f2cb0a068cdc1e519627bf745de0c9e4a85a)
Author: Soren Sandmann Pedersen <ssp at dhcp83-218.boston.redhat.com>
Date:   Fri Apr 27 08:13:08 2007 -0400

    Bug fix in fbCompositeIn_nx8x8888
    
    Make sure both halves of the dst word is set to zero when the masks
    are both 0.

diff --git a/fb/fbmmx.c b/fb/fbmmx.c
index 0e90746..cea8ad9 100644
--- a/fb/fbmmx.c
+++ b/fb/fbmmx.c
@@ -1900,7 +1900,7 @@ fbCompositeSolidMaskSrc_nx8x8888mmx (CAR
 	    }
 	    else
 	    {
-		*dst = 0;
+		*(ullong *)dst = 0;
 	    }
 
 	    mask += 2;