* Sync with Debian unstable, remaining changes: (LP: #490214)
* debian/metacity-common.gconf-defaults:
  - Default to two workspaces
  - Fix default keybinding for shift-alt-tab
* debian/patches/03_strict_focus.patch:
  - Strict focus
* debian/patches/04_worspaces_default_name.patch:
  - Use "Desk" instead of "Workspace" for default workspaces naming.
* debian/patches/05_raise_on_click_for_click_mode.patch:
  - Use raise on click option
* debian/patches/06_drop_Werror.patch
  - Build without -Werror in CFLAGS which fixes FTBFS on armel
* debian/patches/07_fix_wm_cm_selection_timestamp.patch
  - Fix metacity to give up the compositing manager
* debian/watch:
  - Watch for unstable versions