compiz: Changes to 'master'

[David Reveman]

 configure.ac          |   14 ++
 include/compiz.h      |    3 
 metadata/Makefile.am  |    1 
 metadata/core.xml.in  |   23 +++-
 metadata/gconf.xml.in |   17 +--
 metadata/glib.xml.in  |    6 +
 plugins/Makefile.am   |    8 +
 plugins/gconf.c       |   18 ---
 plugins/glib.c        |  264 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in        |    1 
 src/display.c         |   19 +++
 11 files changed, 341 insertions(+), 33 deletions(-)

New commits:
commit 512dcfa9a76bb4d3d765f9ff8b84f7bb5e943a82
Merge: a50d2f9... 1013d0a...
Author: David Reveman <davidr at novell.com>
Date:   Fri May 18 16:10:00 2007 -0400

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

commit a50d2f9e0f66f445338eb5ad7361b48d48446b29
Author: David Reveman <davidr at novell.com>
Date:   Fri May 18 16:05:31 2007 -0400

    Remove timeout based iteration of GLib main loop and instead
    require glib plugin.

commit 21be0fb19201f80caf9a1c3acf968f91a997aa83
Author: David Reveman <davidr at novell.com>
Date:   Fri May 18 15:58:14 2007 -0400

    Add glib plugin.
    
    This plugin properly integrates the GLib main loop
    and makes sure that any plugins that use the default
    GLib main loop will be dispatched efficiently.

commit 02ba5d7bf879fb2b2ca07507810a2bd502e076bb
Author: David Reveman <davidr at novell.com>
Date:   Fri May 18 15:44:13 2007 -0400

    Add compWatchFdEvents function.

commit 40879fdcd4fa13fc66df8fd2a6d923c7d2f3dbc8
Author: David Reveman <davidr at novell.com>
Date:   Thu May 17 18:37:25 2007 -0400

    Turn the texture filter option into an integer option.