[compiz/f15/master] (2 commits) ...Merge commit '2d848521313f26a5a60225a8b090ac82498a1dcb' into f15

[Adam Williamson]

Summary of changes:

  2d84852... fix up the GNOME session stuff so it actually works (*)
  fc7fc2f... Merge commit '2d848521313f26a5a60225a8b090ac82498a1dcb' int

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