compiz: Changes to 'master'

[Mike Dransfield]

 plugins/ini.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 55bd1bd318753231d9f2977d723810715abeb991
Merge: c3a7fc2... 1708507...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri Apr 6 17:44:48 2007 +0100

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

commit c3a7fc25c1e1154d1cabfdfcd09874656dc105dd
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri Apr 6 17:43:20 2007 +0100

    Fix action options with long names