[compiz/f18] (6 commits) ...Merge branch 'master' into f18

[Wolfgang Ulbrich]

Summary of changes:

  9b6a176... fix compiz-decorator-emerald (*)
  5780b84... fix compiz-decorator-gtk (*)
  fae33e8... fix emerald-decorator.desktop (*)
  0ed08e0... fix gtk-decorator.desktop (*)
  21a3f97... update spec file and bump version (*)
  f16774d... Merge branch 'master' into f18

(*) This commit already existed in another branch; no separate mail sent