compiz: Changes to 'master'

[David Reveman]

 include/compiz.h          |    6 
 plugins/annotate.c        |  472 +++++++++++++++++++++++++++++++++++++++-------
 plugins/compiz.schemas.in |  165 +++++++++++++++-
 src/option.c              |   18 +
 4 files changed, 590 insertions(+), 71 deletions(-)

New commits:
commit ecef3a36910d850d621743bb31f49723ffd852ad
Author: David Reveman <davidr at novell.com>
Date:   Wed Nov 15 12:28:58 2006 -0500

    Regen compiz.schemas.in.

commit 02f2e5a8604b598439c9574c25b0a8b857642cf0
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Nov 15 12:16:21 2006 -0500

    Add a few new shapes to annotate plugin and an action option that can be
    used to draw these shapes.

commit 5db7db460d144c638f267de1afd7394e162eb1f4
Author: David Reveman <davidr at novell.com>
Date:   Wed Nov 15 12:10:57 2006 -0500

    Add getColorOptionNamed function.