pixman: Branch 'master'

[Jeff Muizelaar]

Rebased ref, commits from common ancestor:
commit 4546234c18f5bb5e2d193d2fa8ff5c3ca78bc716
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Dec 5 12:01:03 2008 -0500

    [arm-simd] Add a comment about aligning source and destination pointers.

diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index f595325..ceef1a8 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -60,6 +60,8 @@ fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
 	srcLine += srcStride;
 	w = width;
 
+        /* ensure both src and dst are properly aligned before doing 32 bit reads
+         * we'll stay in this loop if src and dst have differing alignments */
 	while (w && (((unsigned long)dst & 3) || ((unsigned long)src & 3)))
 	{
 	    s = *src;