pixman: Branch 'master'

[Søren Sandmann Pedersen]

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

New commits:
diff-tree f1194a8bc0599e3ecceb785795ad8283a7c04dc0 (from 3dbb2a56bd1918595091006c6e0de5260d43af09)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed Jun 20 12:12:43 2007 -0400

    Fix typo

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index dafed13..cad11dd 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1993,7 +1993,7 @@ pixman_image_composite (pixman_op_t     
 		func = fbCompositeIn_8x8mmx;	    
 	    else
 #endif
-		func = fbCompositeIn_8x8;
+		func = fbCompositeSrcIn_8x8;
 	}
 	else if (srcRepeat && pMask && !pMask->common.component_alpha &&
 		 (pSrc->bits.format == PIXMAN_a8r8g8b8 ||