compiz: Changes to 'master'

[Mike Dransfield]

 include/compiz.h |    2 +-
 src/display.c    |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 701b49b10a3a7696e5da793e277bc6b4ae47f19a
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon Apr 23 17:17:41 2007 +0100

    Change compRemoveTimeout to return the closure