compiz: Changes to 'master'

[David Reveman]

 metadata/scale.xml.in |    7 ++++++-
 plugins/scale.c       |   35 +++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 5 deletions(-)

New commits:
commit f45d42091df09d0d2585e0657c93fe2a14832ac9
Author: David Reveman <davidr at novell.com>
Date:   Tue Jun 5 16:29:01 2007 -0400

    Terminated scale mode when edge is triggered while
    already in scale mode.

commit 7c724c66febd7ee6101565a25faa84f22c0a00d5
Author: David Reveman <davidr at novell.com>
Date:   Tue Jun 5 16:05:13 2007 -0400

    Clean up.

commit 502f37ba3c77939a91576fcb774157f95af77dc3
Author: David Reveman <davidr at novell.com>
Date:   Tue Jun 5 16:03:20 2007 -0400

    Minor cleanup.

commit 1afca98587add45b707647228edf8f86e3e8a7f6
Author: Quinn Storm <quinn at quinn-laptop.(none)>
Date:   Sat Jun 2 23:21:16 2007 -0400

    add option to turn off scale behaviour where a click on the desktop shows the desktop