compiz: Changes to 'master'

[Danny Baumann]

 include/compiz-scale.h |    5 ++++-
 plugins/scale.c        |   18 ++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit f0d43e12b57cf949af102b3d48c57772d39bb739
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri Feb 22 09:05:01 2008 +0100

    Don't change stacking order and focus if the user cancelled scale.