Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/pixman
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Tue, 21 Aug 2007 20:31:45 +0000 (16:31 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Tue, 21 Aug 2007 20:31:45 +0000 (16:31 -0400)
1  2 
pixman/pixman-image.c

Simple merge