compiz: Changes to 'master'

[David Reveman]

 plugins/dbus.c  |   12 ++++++++++--
 plugins/water.c |   11 +++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 86fc6c7c8fa2ceb663e63b224f01edba9595f893
Author: David Reveman <davidr at novell.com>
Date:   Mon May 14 15:41:29 2007 -0400

    Make sure key and button are not NULL.

commit b87824df17e05587006104d1120358af87e1fa25
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun May 13 16:11:33 2007 -0500

    Center title wave starting y (was 1/4 below).

commit 4cec091add455390a88b260e0e260b75ac99239d
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun May 13 15:42:53 2007 -0500

    Disable textures and texture targets properly.

commit 852ff73f7e513e2fadaa611a6fbb0abca4c7272a
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sat May 12 18:36:28 2007 -0500

    Slightly speed up Water by replacing a SUB-MUL pair with MAD.