Only show Cinnamon Settings in GNOME sessions
cinnamon-settings: fix load check for desktop page (again!)
Merge pull request #1471 from mtwebster/settings-desktop

cinnamon-settings: fix load check for desktop page (again!)
[modalDialog.js] Enable more control over which button is initially focused.
Merge pull request #1477 from autarkper/dialog-keyfocus-button

[modalDialog.js] Enable more control over which button is initially focused
Rebase and merge #1391 by rjanja, closes #1391
Rebase and merge #1138 from dalcde, closes #1138
Fix #1498
cinnamon-settings - Keyboard - fix keyboard shortcuts for Mint 14/12.10/3.6,
while maintaining compatibility with 13/3.4.
Be more specific in whether to add dedicated terminal shortcut key
or not.
Merge pull request #1405 from mtwebster/keyboard-shortcuts

Keyboard shortcuts fix for 3.6/Mint 14
Revert "Rebase and merge #1138 from dalcde, closes #1138"

This reverts commit 9356ed655813ee1c70772ec4aa7e37f1d2cb3ec6. The commit had the unfortunate side effect of deleting the last workspace in addition to the one to be deleted.
Merge pull request #1508 from autarkper/revert-1138

Revert "Rebase and merge #1138"
layout.js:  Ignore panel heights for metawindow position calculations
when in fullscreen mode.

This caused undesirable behavior in some applications that use tooltips
to display information/controls (like VLC) when in fullscreen mode.

The panel height was still being taken into account initially when
figuring out the useable screen area.
Merge pull request #1524 from mtwebster/tooltip-position-fullscreen

layout.js:  Ignore panel heights for metawindow position calculations
Hide banshee in systray (handled by sound applet)
Background selection: less roundy, less shadow
Added support for <artist> tags in gnome-background-properties
Background selection: Added image dimensions
cinnamon settings: fix problem with custom keybinding names and actions
not being updated when edited.