Merge branch 'master' into vmx
authorLuca Barbato <lu_zero@gentoo.org>
Sat, 12 Apr 2008 07:53:24 +0000 (09:53 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Sat, 12 Apr 2008 07:53:24 +0000 (09:53 +0200)
commit1ec7bd2cb2d02caca06742b0091f293d29d95a44
treec673e05c9cd28e98c69302f055b5e8b4fafa34f3
parente63bf1554b4adf9e687ec86213a97caab2218a77
parent53882228c9bbd50609e2858502b9bc087ca76903
Merge branch 'master' into vmx

Conflicts:

pixman/pixman-pict.c
configure.ac
pixman/Makefile.am
pixman/pixman-pict.c