Merge branch 'master' into vmx

Conflicts:

	pixman/pixman-pict.c

diff --cc configure.ac
Simple merge

diff --cc pixman/Makefile.am
Simple merge

diff --cc pixman/pixman-pict.c
index 6cc81d7,f01a643..c758823
--- 1/pixman/pixman-pict.c
--- 2/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@@ -30,10 -30,9 +30,9 @@@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- #include "pixman.h"
 -
  #include "pixman-private.h"
  #include "pixman-mmx.h"
 +#include "pixman-vmx.h"
  #include "pixman-sse.h"
  
  #define FbFullMask(n)   ((n) == 32 ? (uint32_t)-1 : ((((uint32_t) 1) << n) - 1))