compiz: Changes to 'master'

[Danny Baumann]

 src/option.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8616ff66d442ba22dd6399e1470243cd5f17d20d
Merge: 90b69b49355f9738e4bfa0621dbcdc06d14e9938 adcf73ebc7f01bc9536177a3a99b26a07dc00ca5
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri Aug 8 07:55:19 2008 +0200

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

commit 90b69b49355f9738e4bfa0621dbcdc06d14e9938
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri Aug 8 07:53:12 2008 +0200

    Don't modify action priv value when applying option changes.