compiz: Changes to 'master'

[Danny Baumann]

 src/display.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 15f317f11bd8fe1b43d7f96ea1ebefc8a21753d6
Merge: cf5c766aecf634e8ab0629c1ba1c5ff24fd6d0a0 a1df59ca40c45437391a15e272841f9d5d83dd9a
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat Mar 29 14:31:43 2008 +0100

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

commit cf5c766aecf634e8ab0629c1ba1c5ff24fd6d0a0
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat Mar 29 14:30:01 2008 +0100

    Avoid unnecessarily unloading plugins if the new plugin list does not contain the core plugin.