compiz: Changes to 'master'

[Robert Carr]

 configure.ac |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6a762ef3dedf32216170652284981ad85430b250
Merge: 85a622a... 64fbb40...
Author: Robert Carr <racarr at gorbie.(none)>
Date:   Sun Jun 17 12:57:25 2007 -0400

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

commit 85a622ab0001821fbdb0136605fec219601dae01
Author: Robert Carr <racarr at gorbie.(none)>
Date:   Sun Jun 17 12:56:51 2007 -0400

    Move AM_GCONF_SOURCE_2 in to gconf conditional