Merge lp://staging/~cairo-dock-team/cairo-dock-core/ubuntu into lp://staging/ubuntu/maverick/cairo-dock

CMakeLists.txt (+1/-1)
data/default-theme/plug-ins/rendering/rendering.conf (+3/-3)
data/help.conf.in (+2/-2)
debian/changelog (+16/-0)
src/cairo-dock-gui-launcher.c (+2/-2)
src/cairo-dock-gui-simple.c (+2/-1)
src/cairo-dock-menu.c (+4/-3)
src/cairo-dock.c (+29/-11)
src/gldit/CMakeLists.txt (+14/-1)
src/gldit/cairo-dock-applet-manager.c (+1/-12)
src/gldit/cairo-dock-application-facility.c (+4/-1)
src/gldit/cairo-dock-applications-manager.c (+65/-63)
src/gldit/cairo-dock-config.c (+7/-9)
src/gldit/cairo-dock-container.c (+6/-4)
src/gldit/cairo-dock-dialog-manager.c (+10/-12)
src/gldit/cairo-dock-dock-facility.c (+10/-2)
src/gldit/cairo-dock-dock-manager.c (+13/-8)
src/gldit/cairo-dock-draw-opengl.c (+11/-11)
src/gldit/cairo-dock-draw.c (+13/-14)
src/gldit/cairo-dock-gui-factory.c (+1/-1)
src/gldit/cairo-dock-icon-loader.c (+10/-6)
src/gldit/cairo-dock-icon-loader.h (+2/-2)
src/gldit/cairo-dock-internal-background.c (+8/-5)
src/gldit/cairo-dock-internal-dialogs.c (+1/-0)
src/gldit/cairo-dock-internal-icons.c (+1/-1)
src/gldit/cairo-dock-internal-indicators.c (+4/-4)
src/gldit/cairo-dock-internal-taskbar.c (+67/-65)
src/gldit/cairo-dock-load.c (+29/-4)
src/gldit/cairo-dock-load.h (+3/-3)
src/gldit/cairo-dock-log.c (+1/-1)
src/gldit/cairo-dock-modules.c (+10/-6)
src/gldit/cairo-dock-separator-manager.c (+1/-1)
src/gldit/cairo-dock-surface-factory.c (+114/-7)
src/gldit/cairo-dock-surface-factory.h (+3/-0)
src/gldit/cairo-dock-themes-manager.c (+3/-0)