Merge branch 'master' of sandmann@git.freedesktop.org:/git/pixman
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Thu, 31 Jul 2008 17:32:59 +0000 (13:32 -0400)
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Thu, 31 Jul 2008 17:32:59 +0000 (13:32 -0400)

Trivial merge