compiz: Changes to 'master'

[David Reveman]

 include/compiz.h         |   87 ++++++++++++--
 metadata/Makefile.am     |    4 
 metadata/annotate.xml.in |   66 ++++++++++
 plugins/annotate.c       |  183 +++++++----------------------
 plugins/blur.c           |    1 
 plugins/clone.c          |    1 
 plugins/cube.c           |    1 
 plugins/dbus.c           |    1 
 plugins/decoration.c     |    1 
 plugins/fade.c           |    1 
 plugins/fuse.c           |    1 
 plugins/gconf-dump.c     |    1 
 plugins/gconf.c          |    1 
 plugins/ini.c            |    1 
 plugins/inotify.c        |    1 
 plugins/minimize.c       |    1 
 plugins/move.c           |    1 
 plugins/place.c          |    1 
 plugins/plane.c          |    1 
 plugins/png.c            |    1 
 plugins/regex.c          |    1 
 plugins/resize.c         |    1 
 plugins/rotate.c         |    1 
 plugins/scale.c          |    1 
 plugins/screenshot.c     |    1 
 plugins/svg.c            |    1 
 plugins/switcher.c       |    1 
 plugins/video.c          |    1 
 plugins/water.c          |    1 
 plugins/wobbly.c         |    1 
 plugins/zoom.c           |    1 
 src/display.c            |   31 +----
 src/main.c               |  205 ++++++++++++++++-----------------
 src/metadata.c           |  290 ++++++++++++++++++++++++++++++++++++++++++-----
 src/option.c             |   61 +++++++++
 src/screen.c             |   21 +--
 36 files changed, 664 insertions(+), 311 deletions(-)

New commits:
commit 623731aacf2d1671ed27153bca74ab2cd8093b7f
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 17 16:20:49 2007 -0400

    Clean up.

commit 56571c528b416d994b3ad2b632db1b0f7e8fe4e2
Merge: 294fd0a... a447479...
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 17 16:02:04 2007 -0400

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

commit 294fd0a2133d4c8f37c3f60e4b35ca3bcb235f64
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 17 16:01:23 2007 -0400

    Convert annotate plugin to use new metadata system and store
    default option values in an external xml file.

commit 84771fe1314d865ff03bea4c26d05d31db6b997f
Author: David Reveman <davidr at novell.com>
Date:   Tue Apr 17 15:55:37 2007 -0400

    Improve option initialization and loading of hard coded
    metadata for core and plugins.

commit edc91c6c04b4434c3df0767bca0f793347201db9
Author: David Reveman <davidr at novell.com>
Date:   Mon Apr 16 13:55:57 2007 -0400

    Remove whitespace.

commit 5538c0f77e50f0b732e702fb0058588857a4d736
Author: David Reveman <davidr at novell.com>
Date:   Mon Apr 16 13:55:11 2007 -0400

    Add GetMetadata function to plugin VTable.

commit 8d780e2c69f5b5ccd3a5c8e7d6e55ec8689a8229
Author: David Reveman <davidr at novell.com>
Date:   Mon Apr 16 13:33:44 2007 -0400

    Clean up.