compiz: Changes to 'master'

[David Reveman]

 include/compiz.h |    4 ++++
 src/display.c    |   32 ++------------------------------
 src/option.c     |   26 ++++++++++++++++++++++++++
 src/screen.c     |   12 ++----------
 4 files changed, 34 insertions(+), 40 deletions(-)

New commits:
commit e2b0a841000b4cd8749797578c0bb94684874108
Merge: 337d24c... 55bd1bd...
Author: David Reveman <davidr at novell.com>
Date:   Fri Apr 6 13:24:50 2007 -0400

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

commit 337d24c93d969a2edf034f707626add97ecaf131
Author: David Reveman <davidr at novell.com>
Date:   Fri Apr 6 13:21:51 2007 -0400

    Reduce code by using compSetOption.

commit 668e4141db53e73f3d549baff76249beda892efa
Author: David Reveman <davidr at novell.com>
Date:   Fri Apr 6 13:21:00 2007 -0400

    Reduce code by using compSetOption.

commit 3cf4d20e55a902bcd3ea40a2bdb5c5f0a276fc6e
Author: David Reveman <davidr at novell.com>
Date:   Fri Apr 6 13:20:01 2007 -0400

    Add compSetOption function.