compiz: Changes to 'master'

[David Reveman]

 include/compiz.h |    5 ++++-
 plugins/cube.c   |   14 +++-----------
 plugins/zoom.c   |   11 +++--------
 src/display.c    |   33 ++++++++++++++-------------------
 src/screen.c     |   14 ++++++++++----
 5 files changed, 34 insertions(+), 43 deletions(-)

New commits:
commit 22481bc09476cb0d9271f119eb9e8ef7a10fbc1e
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:47:27 2007 -0400

    Bump ABIVERSION.

commit 4c5fa70c3f083711851020029ca12043907c387d
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:46:48 2007 -0400

    Move lastViewport into CompScreen struct as it's GL context
    dependent.

commit 465a0c1f5e64d92d12d8e9c38aa993d06f45d01d
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:38:49 2007 -0400

    Clean up last viewport check.

commit a998c19e41d0f7b33002edd6d372c2a8aadf4398
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:31:13 2007 -0400

    Use output id.

commit b958103af339be101ec518a3ad6cb801421d6069
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:31:03 2007 -0400

    Use output id.

commit 10210f88ac94c6ee89b854ec0d6f571f1e15a435
Author: David Reveman <davidr at novell.com>
Date:   Fri Jun 1 00:30:35 2007 -0400

    Add output id. The id is always set to the output's index in the
    screen outputs list. The id must be set to ~0 if the output is
    not a real screen output.