pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-mmx.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 15b5960bcb7cadfe6fe92036dc0f08a85a2009f1 (from e73e000d5bd44a198e35b6d0c421a735d00e0b3f)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Jun 19 00:57:33 2007 -0400

    Add in 0xff alpha channel in Over_x888x8x8888mmx

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 6b2130f..8c7be6d 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -2947,7 +2947,7 @@ fbCompositeOver_x888x8x8888mmx (pixman_o
 
 	    if (m)
 	    {
-		__m64 s = load8888 (*src);
+		__m64 s = load8888 (*src | 0xff000000);
 
 		if (m == 0xff)
 		    *dst = store8888 (s);