compiz: Changes to 'master'

[Mike Dransfield]

 plugins/dbus.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 68a9b5a59220782d58cd15ddb60d274d1202c567
Merge: 7da52b6... 3650c8e...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 24 13:05:28 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 7da52b637b5499607f5d4814fae705c81ba8c4da
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 24 13:04:24 2007 +0100

    Use correct variable naming conventions