Merge branch 'trap-fixes'
authorSøren Sandmann Pedersen <ssp@redhat.com>
Thu, 25 Feb 2010 02:01:29 +0000 (21:01 -0500)
committerSøren Sandmann Pedersen <ssp@redhat.com>
Thu, 25 Feb 2010 02:01:29 +0000 (21:01 -0500)
commite0f1d8410715083498a35284ea7e5bb71fabe090
tree37cc04da97f23342bdaefb650e19b8af225f5f23
parent16ef3ab230047221f813905d390bf762a3d8508a
parent282f5cf8b821a34bab1e32957913ef8d9f9ee43c
Merge branch 'trap-fixes'
pixman/pixman-edge-imp.h
pixman/pixman-private.h