compiz: Changes to 'master'

[Danny Baumann]

 plugins/annotate.c |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 35e8ca14e4078a28fad39d3d715eef0dca32be96
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sun Mar 2 19:14:11 2008 +0100

    Fix erase mode.
    This one improves the last attempt to fix the erase mode.

commit b61a7889dda06acd4859a3e0f41453090a9f4e31
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sun Mar 2 19:12:13 2008 +0100

    Revert "Fixed annotate erase mode."
    
    This reverts commit 40435f72073bb5747d1b63948807c207c31174b0.