compiz: Changes to 'master'

[Danny Baumann]

 gtk/window-decorator/gtk-window-decorator.c |   33 ++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 032aac16526ba84661e6d8315193fe356602a960
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sun Nov 11 19:16:11 2007 +0100

    Give options passed over the command line priority over ones from gconf.
    To do that, store flags which options were passed and don't use the gconf values for those.