compiz: Changes to 'master'

[David Reveman]

 include/compiz.h       |    6 +++
 metadata/blur.xml.in   |   23 +++++++++---
 metadata/resize.xml.in |   28 +++++++++++----
 plugins/blur.c         |   87 +++++++++++++++++++++----------------------------
 plugins/resize.c       |   39 ++++++++++++++-------
 5 files changed, 106 insertions(+), 77 deletions(-)

New commits:
commit 4e4a5a0cb84e2cdd8e4151dd3f08ec25225ae0dd
Merge: f9d53e8... d11eb40...
Author: David Reveman <davidr at novell.com>
Date:   Thu May 17 17:54:19 2007 -0400

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

commit f9d53e8bc04d17f2e428a22ad21e8b28f3fcb804
Author: David Reveman <davidr at novell.com>
Date:   Thu May 17 17:54:07 2007 -0400

    Turn the mode option into an integer option.

commit 7465796d186159bcf32745c8a6e5a9289bbf12fb
Author: David Reveman <davidr at novell.com>
Date:   Thu May 17 17:33:08 2007 -0400

    Turn the filter option into an integer option.

commit 29a5c3bd253949442103b6d8b8f3fcec854e1138
Author: David Reveman <davidr at novell.com>
Date:   Thu May 17 17:30:35 2007 -0400

    Add macros that make it easier to use integer options as
    selections.