compiz: Changes to 'master'

[David Reveman]

 plugins/regex.c |   15 +++++++++++++--
 src/display.c   |   10 +++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit a7e4007e5be1feb99367059bbc1c26bf7cb96c02
Author: David Reveman <davidr at novell.com>
Date:   Mon Sep 10 02:45:40 2007 +0100

    Revert "Check d->base.parent to see if the object is properly"
    
    This reverts commit d7a6af1c6b86bb10eb672901fcddcb0e2d05f579.
    
    Using a timeout is not the proper solution but revert to
    this as a ExpHandlerChanged call before regex plugin has
    initialized all objects will definitely not work. A proper
    solution will be added once the new object system is fully
    in place.

commit 5456ea0cc70744c1d254188de219b64db9bc05ed
Author: David Reveman <davidr at novell.com>
Date:   Sun Sep 9 20:59:01 2007 -0400

    Minor cleanup.

commit 18fd107f823fa17e3e60e0609168ac3a57b6c409
Author: David Reveman <davidr at novell.com>
Date:   Sun Sep 9 20:58:16 2007 -0400

    Remove whitespaces.