Merge branch 'for-master'
authorSøren Sandmann Pedersen <ssp@redhat.com>
Sun, 9 May 2010 18:24:24 +0000 (14:24 -0400)
committerSøren Sandmann Pedersen <ssp@redhat.com>
Sun, 9 May 2010 18:24:24 +0000 (14:24 -0400)
1  2 
pixman/pixman-compiler.h

Simple merge