compiz: Changes to 'master'

[Mike Dransfield]

 plugins/ini.c |   67 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 35 insertions(+), 32 deletions(-)

New commits:
commit fa595eea5b14abf06fe3df0b751b91f0ce53ac96
Merge: efcabb2... 9b0eae5...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 11 19:14:38 2007 +0100

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

commit efcabb249edc6c514990641432586d9503104823
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 11 19:13:36 2007 +0100

    Fix crash if config file contains invalid action options