compiz: Changes to 'master'

[Mike Dransfield]

 src/texture.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26b1edff163e7d02b3f004eb568e0f61bbfabef3
Merge: d9fd9c3... 692c842...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 12 12:21:03 2007 +0100

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

commit d9fd9c35bd00c5d48c3256ab76eb16b40db02033
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 12 12:20:01 2007 +0100

    Remove trailing whitespace