compiz: Changes to 'master'

[Danny Baumann]

 plugins/scale.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
commit b6591a32ccbb51e128e0094eef689182bdff6d5c
Merge: 6d1c026... 5425a21...
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jun 21 14:28:35 2007 +0200

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

commit 6d1c0263ee5ee795c43c0e8d2ae124b201f59ff8
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jun 21 14:26:00 2007 +0200

    Properly initialize and uninitialize custom match.