compiz: Changes to 'master'

[Mike Dransfield]

 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 408fffea3f6c7c5f92373837bd9659a420d36b6e
Merge: efb5671... 39cf1c7...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Jun 27 11:03:19 2007 +0100

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

commit efb5671934e40186d4abef7b93a0e11bc7d09fb3
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Jun 27 11:02:33 2007 +0100

    This patch breaks --disable-gconf
    
    Revert "Move AM_GCONF_SOURCE_2 in to gconf conditional"
    
    This reverts commit 85a622ab0001821fbdb0136605fec219601dae01.