compiz: Changes to 'master'

[Mike Dransfield]

 plugins/ini.c |  125 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 103 insertions(+), 22 deletions(-)

New commits:
commit 255d0270b4074a5ea6368dd852781c5fe643a1a5
Merge: d7f7338... 8e3b26f...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Mar 28 17:44:17 2007 +0100

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

commit d7f7338afce0ebfbb24a2c330ac0d69709e5897e
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Mar 28 17:42:38 2007 +0100

    Make action options atomic