compiz: Changes to 'master'

[David Reveman]

 plugins/zoom.c |   21 +++++++++++++--------
 src/texture.c  |    6 +++---
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 05bbdb545b6885b35fa87e41f78ddba69e5356f2
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 20:25:47 2007 -0400

    Track output changes.

commit 9631928833ff76ffa1d3d46535cf8c3ab2758fcc
Merge: b2f47aa... 97a4a6c...
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 20:06:55 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit b2f47aa2a1c50db237635324799883d08e166e77
Merge: 5ca24d1... 0a1e769...
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 17:46:24 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 5ca24d1b4f15c70d2c6073b910b8fdd8187941e5
Merge: 436c0e9... de76d33...
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 13:58:06 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 436c0e9d8da504a4b6d2947b1ea7de6daa3f20f9
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 13:40:34 2007 -0400

    Remove whitespace.

commit 0e02a98ade9aeb1d374a46931e7fdc735a7e750d
Author: David Reveman <davidr at novell.com>
Date:   Thu May 31 11:54:53 2007 -0400

    Fix byte order check in imageBufferToTexture.