compiz: Changes to 'master'

[David Reveman]

 src/screen.c |    2 +-
 src/window.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f996780eefb53831f58c7c7a86c4e9856057da3e
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 31 14:08:03 2007 -0400

    Add missing NULL check.

commit 6d262db179816524849ea303378cd86aad80651b
Author: Roland Baer <roland at Vista.(none)>
Date:   Tue Jul 31 13:45:04 2007 +0300

    Removed useless test