Merge lp://staging/~compiz-team/compiz-core/compiz-core.fix_873344_873364 into lp://staging/compiz-core/0.9.5

gtk/CMakeLists.txt (+1/-5)
gtk/gnome/50-compiz-desktop-key.xml.in (+0/-16)
gtk/gnome/50-compiz-key.xml.in (+0/-28)
gtk/gnome/CMakeLists.txt (+3/-74)
gtk/gnome/compiz-window-manager.c (+0/-505)
gtk/gnome/compiz-window-manager.h (+0/-39)
gtk/gnome/compiz-wm.desktop.in (+0/-17)
gtk/window-decorator/cairo.c (+24/-5)
gtk/window-decorator/decorator.c (+154/-125)
gtk/window-decorator/decorprops.c (+3/-3)
gtk/window-decorator/events.c (+14/-9)
gtk/window-decorator/frames.c (+22/-22)
gtk/window-decorator/gtk-window-decorator.c (+21/-8)
gtk/window-decorator/gtk-window-decorator.h (+62/-27)
gtk/window-decorator/gwd.schemas.in (+11/-0)
gtk/window-decorator/metacity.c (+123/-23)
gtk/window-decorator/settings.c (+129/-22)
gtk/window-decorator/switcher.c (+17/-18)
gtk/window-decorator/wnck.c (+101/-2)
include/core/core.h (+1/-1)
kde/window-decorator-kde4/decorator.cpp (+133/-84)
kde/window-decorator-kde4/decorator.h (+15/-10)
plugins/decor/decor.xml.in (+74/-34)
plugins/decor/src/decor.cpp (+67/-55)
src/window.cpp (+17/-17)