compiz: Changes to 'master'

[David Reveman]

 include/compiz.h   |   17 +++++-
 plugins/annotate.c |   28 -----------
 src/display.c      |  108 ++++++++-----------------------------------
 src/metadata.c     |  132 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/screen.c       |   47 +-----------------
 5 files changed, 165 insertions(+), 167 deletions(-)

New commits:
commit acfc9d502823be73a4c5e7d201eea25fe4eebaa5
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:19:18 2007 -0400

    Remove unused definitions.

commit a1df8017b067ec3cc488541e900db7ab71d71e14
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:18:19 2007 -0400

    Initialize hsize and vsize from initial option values.

commit 86086409c6b8a4ffb82ab1705b7865fcd1243328
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:17:15 2007 -0400

    Remove opacityStep variable in CompScreen struct.

commit 00dbab47d365bc46c4737452aef053d36badf8e6
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:06:49 2007 -0400

    Remove unused variable.

commit 37bc59880022441be0cbf3ba2fc92428932643b9
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:04:26 2007 -0400

    Removed unused variables.

commit 33b13a2d8f75341c6c7e8ca40153d8fe64566bbd
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:03:42 2007 -0400

    Use compSetDisplayOption.

commit 711e1b90970a49c3f43d0ea515900f0b572a03a2
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 18:01:01 2007 -0400

    Use compSetDisplayOption and compSetScreenOption.

commit 18a3d87c4c5a411b510678b98f6ae6373bdf6902
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 17:58:20 2007 -0400

    Add compSetDisplayOption and compSetScreenOption.

commit 349212131e8465179be411703f35fcef1a2acce7
Merge: 4bc3c98... 7f36a24...
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 17:38:37 2007 -0400

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

commit 4bc3c985d09f79cf2fa8a16c471e652f3427b4e0
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 17:37:43 2007 -0400

    Add CompActionStateAutoGrab action state, which isused to indicate
    that passive grabs for any key or mouse bindings in an action
    option should automatically be added and removed.

commit 77b39f6488b0178494aeaf90f353721bbf8528ac
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 24 16:38:55 2007 -0400

    Add helper tag to match options. This tag can be used to indicate
    that the match object should not be automatically updated when
    initialized and when the option value changes.