Merge tag 'pixman-0.12.0'
authorJulien Cristau <jcristau@debian.org>
Fri, 19 Sep 2008 08:29:05 +0000 (10:29 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 19 Sep 2008 08:29:05 +0000 (10:29 +0200)
Conflicts:

configure.ac


Trivial merge