compiz: Changes to 'master'

[Danny Baumann]

 plugins/scale.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 690dbad3bbe9a650ca948839f18ed9ef1ee20af7
Merge: 965f77b1f8dcdf076d226cb106171c2f87830db2 ac4902c1193e70fe23e841063fe3a4991ed93dba
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Feb 27 17:53:18 2008 +0100

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

commit 965f77b1f8dcdf076d226cb106171c2f87830db2
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Feb 27 17:49:24 2008 +0100

    Set cancel state when ending scale the same way as it was initiated.
    When not doing that, the last active window will be activated, which might be unintended, e.g. if the window is shaded.
    In general, we want scale to only activate windows if the user selected them by either using the mouse or the Return key.