Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/pixman
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Sun, 17 Jun 2007 22:49:02 +0000 (18:49 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Sun, 17 Jun 2007 22:49:02 +0000 (18:49 -0400)

Trivial merge