Merge branch 'master' of git+ssh://git.freedesktop.org/git/pixman into yuv-porting

Conflicts:

	pixman/pixman-image.c

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

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

diff --cc pixman/pixman-image.c
index 0bcd901,d40234d..1c4abc2
--- 1/pixman/pixman-image.c
--- 2/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@@ -320,23 -345,26 +345,26 @@@ pixman_image_create_bits (pixman_format
      pixman_image_t *image;
      uint32_t *free_me = NULL;
  
 -    /* must be a whole number of uint32_t's 
 +    /* must be a whole number of uint32_t's
       */
      return_val_if_fail (bits == NULL ||
 -                      (rowstride_bytes % sizeof (uint32_t)) == 0, NULL); 
 +                      (rowstride_bytes % sizeof (uint32_t)) == 0, NULL);
  
-     if (!bits)
+     if (!bits && width && height)
      {
        free_me = bits = create_bits (format, width, height, &rowstride_bytes);
        if (!bits)
            return NULL;
      }
 -    
 +
      image = allocate_image();
  
-     if (!image)
+     if (!image) {
+       if (free_me)
+           free (free_me);
        return NULL;
- 
+     }
+     
      image->type = BITS;
      image->bits.format = format;
      image->bits.width = width;

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

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

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

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

diff --cc pixman/pixman.h
Simple merge