Merge branch 'master' of git+ssh://git.freedesktop.org/git/pixman into yuv-porting
authorAlan Hourihane <alanh@tungstengraphics.com>
Wed, 24 Oct 2007 20:39:34 +0000 (21:39 +0100)
committerAlan Hourihane <alanh@tungstengraphics.com>
Wed, 24 Oct 2007 20:39:34 +0000 (21:39 +0100)

Trivial merge