compiz: Changes to 'master'

[Mike Dransfield]

 include/compiz.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0e01bec891a6e5d1ed6293f003c34e0ee97f9b22
Merge: fe799b5... 22481bc...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri Jun 1 11:42:28 2007 +0100

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

commit fe799b54040e53294a469fb1a12874676c69130c
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri Jun 1 11:27:13 2007 +0100

    Code formatting