Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/pixman
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Wed, 13 May 2009 17:10:01 +0000 (13:10 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Wed, 13 May 2009 17:10:01 +0000 (13:10 -0400)

Trivial merge