compiz: Changes to 'master'

[Danny Baumann]

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

New commits:
commit 0c986e800c6ca25b8929a2c0707ccc6054532261
Merge: e591ee80dd391060e1c7e2b189488d6b75e46f1f f21c3b60a16a8acf34a9ebb8667626ff3e586164
Author: Danny Baumann <dannybaumann at web.de>
Date:   Tue Apr 22 09:45:07 2008 +0200

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

commit e591ee80dd391060e1c7e2b189488d6b75e46f1f
Merge: 9bf73a1d76e019cfee2b80b685ee44c246c9cd97 9f12004756a9960a1d21153426c5a262742b9677
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Apr 21 09:44:47 2008 +0200

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

commit 9bf73a1d76e019cfee2b80b685ee44c246c9cd97
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Apr 21 09:44:15 2008 +0200

    Don't prevent focus for windows on other viewports if they are excluded from focus stealing prevention.