compiz: Changes to 'master'

[David Reveman]

 include/compiz.h |    1 +
 src/main.c       |   12 +++++++++---
 src/screen.c     |    4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 256882741efef0dfc583304fe672045281a12895
Author: dragoran <drago01 at gmail.com>
Date:   Fri Mar 2 12:14:03 2007 +0100

    Add --ignore-desktop-hints command line option, which can be used
    to make compiz not read "number of desktops" and "current desktop"
    hints left by previous WM.