compiz: Changes to 'master'

[Danny Baumann]

 plugins/Makefile.am |    1 +
 plugins/rotate.c    |   21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a54a1188bdb8533dfd45cde9c153ad9c83405a84
Merge: 40355460aefcbf7d1b00d829b0f3da479d1f5861 9b3f805077228f97adcd130a0158bd216489d2cd
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Jun 25 09:44:51 2008 +0200

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

commit 40355460aefcbf7d1b00d829b0f3da479d1f5861
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Jun 25 09:44:34 2008 +0200

    Add missing glib includes.

commit f7bc422a7d6579f8b88ffd15257e4587d50cb1d9
Merge: 680bac110dd60d17575078fb6ae6b76cc588cfd1 4271289b97d6d2abddadd6c06c19a360c2ed1bd5
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jun 19 16:11:53 2008 +0200

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

commit 680bac110dd60d17575078fb6ae6b76cc588cfd1
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jun 19 16:11:42 2008 +0200

    Don't focus default window when rotating due to window activation.