compiz: Changes to 'master'

[David Reveman]

 include/compiz.h |   12 +++
 plugins/dbus.c   |    2 
 src/plugin.c     |  196 ++++++++++++++++++++++++++++++-------------------------
 3 files changed, 122 insertions(+), 88 deletions(-)

New commits:
commit 70f7c818b39d2791d5cab7990114bb15b5496ac4
Author: David Reveman <davidr at novell.com>
Date:   Mon Jul 24 18:01:20 2006 -0400

    Make it possible to wrap plugin loading functions.

commit 568b0a310d1fe03599c682c9e28cf3ae9a2dcd05
Author: David Reveman <davidr at novell.com>
Date:   Mon Jul 24 17:59:19 2006 -0400

    Remove fd watch when being unloaded.