Merge branch 'eliminate-composite'

Conflicts:
	pixman/pixman-sse2.c

diff --cc pixman/pixman-private.h
Simple merge

diff --cc pixman/pixman-sse2.c
index f69de0b,c8481dc..946e7ba
--- 1/pixman/pixman-sse2.c
--- 2/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@@ -5955,12 -5900,8 +5900,12 @@@ __attribute__((__force_align_arg_pointe
  pixman_implementation_t *
  _pixman_implementation_create_sse2 (void)
  {
 -    pixman_implementation_t *mmx = _pixman_implementation_create_mmx ();
 -    pixman_implementation_t *imp = _pixman_implementation_create (mmx, sse2_fast_paths);
 +#ifdef USE_MMX
 +    pixman_implementation_t *fallback = _pixman_implementation_create_mmx ();
 +#else
 +    pixman_implementation_t *fallback = _pixman_implementation_create_fast_path ();
 +#endif
-     pixman_implementation_t *imp = _pixman_implementation_create (fallback);
++    pixman_implementation_t *imp = _pixman_implementation_create (fallback, sse2_fast_paths);
  
      /* SSE2 constants */
      mask_565_r  = create_mask_2x32_128 (0x00f80000, 0x00f80000);

diff --cc pixman/pixman-utils.c
Simple merge