Merge branch 'eliminate-composite'
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Sat, 20 Feb 2010 18:09:01 +0000 (13:09 -0500)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Sat, 20 Feb 2010 18:09:01 +0000 (13:09 -0500)
commit14f201dc47ba76fcf677936f4f809249054fd6ad
treedbd2b21f74fbf9d001b2506e122b3ed34e5aabfd
parent94f585916a2385146ee5c803f7850b21149d728b
parent6b2da683debd1b3fc1862752cb26e6799b644e05
Merge branch 'eliminate-composite'

Conflicts:
pixman/pixman-sse2.c
pixman/pixman-private.h
pixman/pixman-sse2.c
pixman/pixman-utils.c