compiz: Changes to 'master'

[Mike Dransfield]

 plugins/rotate.c |    6 +++---
 plugins/scale.c  |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f647b95086f17c298f623e0c58785091f5e46d54
Merge: 7a71095... 5dba889...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Tue May 15 15:45:35 2007 +0100

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

commit 7a7109529074bf06f0dedeeb3475b0d79e9c152b
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Tue May 15 15:44:57 2007 +0100

    Use active window rather than the action window for scale_group
    and rotate with window options