compiz: Changes to 'master'

[Mike Dransfield]

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

New commits:
commit d11eb40edc50e7a83d91e72786bd238dd95a83ec
Merge: 1e1a442... 9c1902c...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 17 20:55:08 2007 +0100

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

commit 1e1a4421a799e6e550f49fae9623c948b9504365
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 17 20:54:09 2007 +0100

    Handle cases where there is no trailing newline in the option file