compiz: Changes to 'master'

[Mike Dransfield]

 plugins/ini.c |  441 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 236 insertions(+), 205 deletions(-)

New commits:
commit 3569570d7aee80f9906117460745c3f1b982e065
Merge: d077219... a71a9b3...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 11 15:58:15 2007 +0100

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

commit d07721900476df2ce26c7de6a7d71e8167a165d9
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 11 15:50:02 2007 +0100

    Code formatting changes

commit 2b9dbbcfd4b63aa0da004cfeeeb2faa8d0291034
Author: Patrick Niklaus <patrick.niklaus at googlemail.com>
Date:   Wed Apr 11 15:46:02 2007 +0100

    Improve action reading code