compiz: Changes to 'master'

[Danny Baumann]

 plugins/scale.c |    8 ++++----
 src/event.c     |    5 +++--
 src/plugin.c    |   16 +++++++++++++---
 3 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit 4b817bcd6375faf172ca04fa7db7eb4772ce7edf
Merge: 63fd486d6486dc7aaaca945992f3ddc9e447d12e 37e75d240d406ced0481101866b7b8711e4844cd
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jul 3 09:42:18 2008 +0200

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

commit 63fd486d6486dc7aaaca945992f3ddc9e447d12e
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sat Jun 21 23:46:26 2008 -0500

    Allow terminating scale mode while entering.

commit b4a8a1a6459da2f1725cf7d909dc9ae28394fcd7
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jul 3 09:24:10 2008 +0200

    Only move focus to window on click if it wasn't focussed before.

commit 584cf88271bcbd798e429f6d66fc50e3f76c9dae
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jul 3 09:21:46 2008 +0200

    Improve ABI version check printout.