compiz: Changes to 'master'

[Danny Baumann]

 src/window.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit a8d6e0b939e0b9227cc9ab158a747e24710e9b87
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Oct 15 10:44:56 2007 +0200

    We have to send the WM_TAKE_FOCUS message even if we directly set the input focus.

commit 2b9f3997650a590028d50b70cce1b635ee5dc9e8
Merge: 3a5a0c33c0ab4daeaa5cc2b903abb0d1cfcae107 f26e7e6b26526ceabe3b68ce7fb61b1864dbb948
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Oct 15 09:02:33 2007 +0200

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

commit 3a5a0c33c0ab4daeaa5cc2b903abb0d1cfcae107
Merge: 8069a921fdd4e08600a24d6d1b9a796753e8a543 00e3b952dbacec6a4e8d6b2e122cd7eb7b991d8c
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri Oct 12 09:31:13 2007 +0200

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

commit 8069a921fdd4e08600a24d6d1b9a796753e8a543
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Oct 11 14:22:25 2007 +0200

    We have a CompScreen* variable, use it.