Merge branch 'master' of git://anongit.freedesktop.org/pixman

diff --cc configure.ac
Simple merge

diff --cc pixman/Makefile.am
index e60c4eb,66283a2..e530a66
--- 1/pixman/Makefile.am
--- 2/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@@ -34,17 -28,5 +28,17 @@@ libpixman_mmx_la_SOURCES = 
        pixman-mmx.h
  libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
  libpixman_mmx_la_LIBADD = $(DEP_LIBS)
- libpixman_la_LIBADD += libpixman-mmx.la
+ libpixman_1_la_LIBADD += libpixman-mmx.la
  endif
 +
 +# vmx code
 +if USE_VMX
 +noinst_LTLIBRARIES += libpixman-vmx.la
 +libpixman_vmx_la_SOURCES = \
 +      pixman-vmx.c            \
 +      pixman-vmx.h
 +libpixman_vmx_la_CFLAGS = $(DEP_CFLAGS) $(VMX_CFLAGS)
 +libpixman_vmx_la_LIBADD = $(DEP_LIBS)
 +libpixman_la_LIBADD += libpixman-vmx.la
 +endif
 +

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